diff --git a/.github/actions/e2e/action.yml b/.github/actions/e2e/action.yml index 2c42296cda..307e6ae574 100644 --- a/.github/actions/e2e/action.yml +++ b/.github/actions/e2e/action.yml @@ -60,7 +60,7 @@ runs: run: | set -u; mkdir -p "${SMART_RUNNER_PATH}" - if [[ $(aws s3 ls "${S3_BUILD_BUCKET}/adf/${REMOTE_PATH}" > /dev/null; echo $?) -eq 0 ]]; then + if [[ $(aws s3 ls "${S3_BUILD_BUCKET}/adf/${REMOTE_PATH}" > /dev/null; echo $?) -eq 0 ]]; then echo "downloading test files" aws s3 cp "${S3_BUILD_BUCKET}/adf/${REMOTE_PATH}" .; tar xzf ${{ inputs.e2e-tar-name }}; @@ -134,7 +134,7 @@ runs: PROVIDER: "${{ inputs.e2e-test-provider }}" AUTH_TYPE: "${{ inputs.e2e-test-auth }}" E2E_TEST_ID: "${{ inputs.e2e-test-id }}" - + uses: nick-fields/retry@v2.8.2 with: timeout_minutes: 40 @@ -144,15 +144,23 @@ runs: command: | set -u; export GH_ACTION_RETRY_COUNT=$(cat ${GITHUB_OUTPUT} | grep -E '^[0-9]{1,2}$' | tail -n1) - echo "RETRY GH_ACTION_RETRY_COUNT = <$GH_ACTION_RETRY_COUNT>" + echo "RETRY GH_ACTION_RETRY_COUNT = <$GH_ACTION_RETRY_COUNT>" if [[ ${{ inputs.e2e-test-folder }} == 'content-services/upload' ]]; then export DISPLAY=:99 chromedriver --url-base=/wd/hub & - sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional + sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional bash ./scripts/travis/e2e/e2e.sh "$E2E_TEST_ID" "browser" || exit 1 else - bash ./scripts/travis/e2e/e2e.sh "$E2E_TEST_ID" || exit 1 + bash ./scripts/travis/e2e/e2e.sh "$E2E_TEST_ID" || exit 1 fi + + - name: upload artifacts on gh + id: upload_gh + uses: actions/upload-artifact@v3 + with: + name: e2e-artifact-output + path: /home/runner/work/alfresco-ng2-components/alfresco-ng2-components/e2e-output-* + - name: upload smartrunner tests results on s3 to cache tests shell: bash if: always() diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 9163245837..da74958f74 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -194,7 +194,6 @@ jobs: - uses: ./.github/actions/download-cache-and-artifacts - run: nx affected:build $NX_CALCULATION_FLAGS --prod - run: nx build demoshell --configuration production - - run: rm -f /home/runner/work/alfresco-ng2-components/alfresco-ng2-components/node_modules/.ngcc_lock_file - run: nx affected --target=build-storybook $NX_CALCULATION_FLAGS --configuration ci - uses: ./.github/actions/upload-cache-and-artifacts