diff --git a/package-lock.json b/package-lock.json index 12c5e0dd4e..a41d2a1de5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,9 +38,9 @@ } }, "@alfresco/js-api": { - "version": "3.10.0-c05b67bb1af16b57b9fdf9d185fb2955c3af08f2", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.10.0-c05b67bb1af16b57b9fdf9d185fb2955c3af08f2.tgz", - "integrity": "sha512-04VoHdDDOYvdR7sveE2syxVj2DvR3jq1czqwfrqh7vPCuvlp8t89LPIkepWa1OzCnv9VGN87FilFKhZQLaJq8Q==", + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.9.0.tgz", + "integrity": "sha512-O0Xe175Ziks+ap8Pb1VbjlGuB1x3cgxdPIKIPziXjXb7eAbvk7VO4HItwgQ6itSvFIU4H5CXO1t+NfTucak7EA==", "requires": { "event-emitter": "^0.3.5", "minimatch": "3.0.4", diff --git a/scripts/travis/e2e/content-services-e2e.sh b/scripts/travis/e2e/content-services-e2e.sh index fe9d882bf8..16914cebc3 100755 --- a/scripts/travis/e2e/content-services-e2e.sh +++ b/scripts/travis/e2e/content-services-e2e.sh @@ -8,17 +8,18 @@ export CONTEXT_ENV="content-services" export PROVIDER='ECM' export AUTH_TYPE='BASIC' -./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; -AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)" -AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; +if [[ $TRAVIS_PULL_REQUEST == "true" ]]; then + ./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)" + AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; +fi; node ./scripts/check-env/check-cs-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1 #-b is needed to run the Folder upload test that are not workin in Headless chrome RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -b -save -m 4 || exit 1) -if [[ $AFFECTED_LIBS =~ "testing" || $AFFECTED_LIBS =~ "$CONTEXT_ENV" || $TRAVIS_PULL_REQUEST == "false" ]]; -then +if [[ $AFFECTED_LIBS =~ "testing" || $AFFECTED_LIBS =~ "$CONTEXT_ENV" || $TRAVIS_PULL_REQUEST == "false" ]]; then $RUN_CHECK $RUN_E2E --folder $CONTEXT_ENV else if [[ $AFFECTED_E2E = "e2e/$CONTEXT_ENV" ]]; diff --git a/scripts/travis/e2e/core-e2e.sh b/scripts/travis/e2e/core-e2e.sh index 8995ab9ab8..7f80f410cf 100755 --- a/scripts/travis/e2e/core-e2e.sh +++ b/scripts/travis/e2e/core-e2e.sh @@ -8,10 +8,11 @@ export CONTEXT_ENV="core" export PROVIDER='ALL' export AUTH_TYPE='BASIC' -./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; - -AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)" -AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; +if [[ $TRAVIS_PULL_REQUEST == "true" ]]; then + ./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)" + AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; +fi; node ./scripts/check-env/check-ps-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1 node ./scripts/check-env/check-cs-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1 diff --git a/scripts/travis/e2e/insights-e2e.sh b/scripts/travis/e2e/insights-e2e.sh index 7365bb4f9f..e9502f1bd6 100755 --- a/scripts/travis/e2e/insights-e2e.sh +++ b/scripts/travis/e2e/insights-e2e.sh @@ -7,9 +7,11 @@ export AUTH_TYPE='BASIC' cd $DIR/../../../ -./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; +if [[ $TRAVIS_PULL_REQUEST == "true" ]]; then + ./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)" +fi; -AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)" if [[ $AFFECTED_LIBS =~ "testing" || $AFFECTED_LIBS =~ "insight" || $TRAVIS_PULL_REQUEST == "false" ]]; then node ./scripts/check-env/check-ps-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1; diff --git a/scripts/travis/e2e/process-services-cloud-e2e.sh b/scripts/travis/e2e/process-services-cloud-e2e.sh index 14b80518f2..d608824d0e 100755 --- a/scripts/travis/e2e/process-services-cloud-e2e.sh +++ b/scripts/travis/e2e/process-services-cloud-e2e.sh @@ -8,10 +8,11 @@ export CONTEXT_ENV="process-services-cloud" export PROVIDER="ALL" export AUTH_TYPE="OAUTH" -./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; - -AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)" -AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; +if [[ $TRAVIS_PULL_REQUEST == "true" ]]; then + ./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)" + AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; +fi; RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST_BPM" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" -host_sso "$E2E_HOST_SSO" -identity_admin_email "$E2E_ADMIN_EMAIL_IDENTITY" -identity_admin_password "$E2E_ADMIN_PASSWORD_IDENTITY" -prefix $TRAVIS_BUILD_NUMBER --use-dist -m 2 -save -b ) diff --git a/scripts/travis/e2e/process-services-e2e.sh b/scripts/travis/e2e/process-services-e2e.sh index e99b37365a..09ef01c254 100755 --- a/scripts/travis/e2e/process-services-e2e.sh +++ b/scripts/travis/e2e/process-services-e2e.sh @@ -8,10 +8,11 @@ export CONTEXT_ENV="process-services" export PROVIDER='BPM' export AUTH_TYPE='BASIC' -./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; - -AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)" -AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; +if [[ $TRAVIS_PULL_REQUEST == "true" ]]; then + ./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)" + AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; +fi; node ./scripts/check-env/check-ps-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1 RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -m 2 || exit 1) diff --git a/scripts/travis/e2e/search-e2e.sh b/scripts/travis/e2e/search-e2e.sh index 443398c414..ceeeb52045 100755 --- a/scripts/travis/e2e/search-e2e.sh +++ b/scripts/travis/e2e/search-e2e.sh @@ -8,10 +8,11 @@ export CONTEXT_ENV="search" export PROVIDER='ECM' export AUTH_TYPE='BASIC' -./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; - -AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)" -AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; +if [[ $TRAVIS_PULL_REQUEST == "true" ]]; then + ./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)" + AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; +fi; node ./scripts/check-env/check-cs-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1 RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -m 2 || exit 1)