diff --git a/.github/actions/before-e2e/action.yml b/.github/actions/before-e2e/action.yml index ae658c08c4..886302b0be 100644 --- a/.github/actions/before-e2e/action.yml +++ b/.github/actions/before-e2e/action.yml @@ -1,32 +1,6 @@ name: "Before e2e" description: "Before e2e" -inputs: - from: - description: 'path to download the artifact' - required: true - type: string - to: - description: 'path to save artifact to' - required: true - type: string - id: - description: 'test suite id' - required: true - type: number - aws-access-key-id: - description: 'aws access key id' - required: true - type: string - aws-secret-access-key: - description: 'aws secret access key' - required: true - type: string - aws-region: - description: 'aws region' - required: true - type: string - runs: using: "composite" steps: @@ -34,15 +8,6 @@ runs: shell: bash run: ./node_modules/@alfresco/adf-cli/bin/adf-cli check-cs-env --host $BASE_URL -u $ADMIN_EMAIL -p $ADMIN_PASSWORD || exit 1 - # - name: Download artifacts - # uses: ./.github/actions/download-job-artifact - # with: - # artifact: ${{ inputs.from }} - # output: ${{ inputs.to }} - # aws-access-key-id: ${{ inputs.aws-access-key-id }} - # aws-secret-access-key: ${{ inputs.aws-secret-access-key }} - # aws-region: ${{ inputs.aws-region }} - - name: Install google chrome shell: bash run: | diff --git a/.github/actions/before-install/action.yml b/.github/actions/before-install/action.yml index 4b42f896c8..0f4ddf244e 100644 --- a/.github/actions/before-install/action.yml +++ b/.github/actions/before-install/action.yml @@ -22,8 +22,6 @@ runs: S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/api" fi - echo "S3_DBP_FOLDER="$S3_DBP_ROOT_FOLDER/${{ github.run_id }}"" >> $GITHUB_ENV - - name: ADF linking if: ${{ github.event_name == 'pull_request'}} uses: ./.github/actions/adf-linking diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index a5d7f44214..3118e9b12a 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -23,8 +23,6 @@ env: CONTENT_IDENTITY_PASSWORD: ${{ secrets.CONTENT_IDENTITY_PASSWORD }} SCREENSHOT_USERNAME: ${{ secrets.SCREENSHOT_USERNAME }} SCREENSHOT_PASSWORD: ${{ secrets.SCREENSHOT_PASSWORD}} - AWS_REGION: "eu-west-2" - CONTENT_CE_DIST_PATH: "./dist/content-ce" PLAYWRIGHT_E2E_HOST: ${{ secrets.PLAYWRIGHT_E2E_HOST }} GH_BUILD_NUMBER: ${{ github.run_id }} MAXINSTANCES: 2 @@ -74,16 +72,6 @@ jobs: path: ./dist/content-ce key: cache-dist-${{ github.run_id }} - # - name: upload job artifact - # if: ${{ success() }} - # uses: ./.github/actions/upload-job-artifact - # with: - # artifact: $CONTENT_CE_DIST_PATH - # output: $S3_DBP_FOLDER/alfresco-content-app.tar.bz2 - # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - # aws-region: ${{ env.AWS_REGION }} - unit-tests: needs: [lint, build] name: "Unit tests: ${{ matrix.unit-tests.name }}" @@ -152,13 +140,7 @@ jobs: key: cache-dist-${{ github.run_id }} - uses: ./.github/actions/before-e2e - with: - from: "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" - to: $CONTENT_CE_DIST_PATH - id: ${{ matrix.e2e-suites.id }} - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: ${{ env.AWS_REGION }} + - uses: ./.github/actions/run-e2e with: options: "--suite=${{ matrix.e2e-suites.name }}" @@ -215,13 +197,6 @@ jobs: key: cache-dist-${{ github.run_id }} - uses: ./.github/actions/before-e2e - with: - from: "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" - to: $CONTENT_CE_DIST_PATH - id: 15 - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: ${{ env.AWS_REGION }} - name: before playwright shell: bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bfd82095b9..8cf0c0cae8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,8 +17,6 @@ env: BASE_URL: ${{ secrets.PIPELINE_ENV_URL }} ADMIN_EMAIL: ${{ secrets.PIPELINE_ADMIN_USERNAME }} ADMIN_PASSWORD: ${{ secrets.PIPELINE_ADMIN_PASSWORD }} - AWS_REGION: "eu-west-2" - CONTENT_CE_DIST_PATH: "./dist/content-ce" PLAYWRIGHT_E2E_HOST: ${{ secrets.PLAYWRIGHT_E2E_HOST }} NPM_REGISTRY_ADDRESS: ${{ secrets.NPM_REGISTRY_ADDRESS }}