diff --git a/.github/integ-config/integ-all.yml b/.github/integ-config/integ-all.yml index 76976c98f42..91cf76b9a32 100644 --- a/.github/integ-config/integ-all.yml +++ b/.github/integ-config/integ-all.yml @@ -846,3 +846,13 @@ tests: # sample_name: duplicate-packages # spec: duplicate-packages # browser: *minimal_browser_list + + # SSR context isolation + - test_name: integ_ssr_context_isolation + desc: 'SSR Context Isolation' + framework: next + category: ssr-adapter + sample_name: ssr-context-isolation + spec: ssr-context-isolation + yarn_script: ci:ssr-context-isolation + browser: [chrome] diff --git a/.github/workflows/callable-e2e-test.yml b/.github/workflows/callable-e2e-test.yml index 67b35106458..dc88dc98368 100644 --- a/.github/workflows/callable-e2e-test.yml +++ b/.github/workflows/callable-e2e-test.yml @@ -34,6 +34,9 @@ on: retry_count: required: true type: number + yarn_script: + required: false + type: string env: AMPLIFY_DIR: /home/runner/work/amplify-js/amplify-js/amplify-js @@ -81,18 +84,22 @@ jobs: E2E_RETRY_COUNT: ${{ inputs.retry_count }} E2E_TEST_NAME: ${{ inputs.test_name }} run: | - ../amplify-js/scripts/retry-yarn-script.sh -s \ - "ci:test \ - $E2E_FRAMEWORK \ - $E2E_CATEGORY \ - $E2E_SAMPLE_NAME \ - $E2E_SPEC \ - $E2E_BROWSER \ - dev \ - $E2E_BACKEND \ - $E2E_AMPLIFY_JS_DIR" \ - -n $E2E_RETRY_COUNT - + if [ -z "${{ inputs.yarn_script }}"]; then + ../amplify-js/scripts/retry-yarn-script.sh -s \ + "ci:test \ + $E2E_FRAMEWORK \ + $E2E_CATEGORY \ + $E2E_SAMPLE_NAME \ + $E2E_SPEC \ + $E2E_BROWSER \ + dev \ + $E2E_BACKEND \ + $E2E_AMPLIFY_JS_DIR" \ + $E2E_YARN_SCRIPT \ + -n $E2E_RETRY_COUNT + else + echo "Skipping specialized yarn script execution in the dev environment." + fi - name: Run cypress tests for ${{ inputs.test_name }} prod shell: bash working-directory: amplify-js-samples-staging @@ -107,17 +114,22 @@ jobs: E2E_RETRY_COUNT: ${{ inputs.retry_count }} E2E_TEST_NAME: ${{ inputs.test_name }} run: | - ../amplify-js/scripts/retry-yarn-script.sh -s \ - "ci:test \ - $E2E_FRAMEWORK \ - $E2E_CATEGORY \ - $E2E_SAMPLE_NAME \ - $E2E_SPEC \ - $E2E_BROWSER \ - prod \ - $E2E_BACKEND \ - $E2E_AMPLIFY_JS_DIR" \ - -n $E2E_RETRY_COUNT + if [ -z "${{ inputs.yarn_script }}"]; then + ../amplify-js/scripts/retry-yarn-script.sh -s \ + "ci:test \ + $E2E_FRAMEWORK \ + $E2E_CATEGORY \ + $E2E_SAMPLE_NAME \ + $E2E_SPEC \ + $E2E_BROWSER \ + prod \ + $E2E_BACKEND \ + $E2E_AMPLIFY_JS_DIR" \ + $E2E_YARN_SCRIPT \ + -n $E2E_RETRY_COUNT + else + yarn ${{ inputs.yarn_script }} + fi - name: Upload artifact uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 https://github.com/actions/upload-artifact/commit/0b7f8abb1508181956e8e162db84b466c27e18ce if: failure() diff --git a/.github/workflows/callable-e2e-tests.yml b/.github/workflows/callable-e2e-tests.yml index e324d62687c..7c42747a925 100644 --- a/.github/workflows/callable-e2e-tests.yml +++ b/.github/workflows/callable-e2e-tests.yml @@ -45,6 +45,7 @@ jobs: backend: ${{ matrix.integ-config.backend }} timeout_minutes: ${{ matrix.integ-config.timeout_minutes || 35 }} retry_count: ${{ matrix.integ-config.retry_count || 3 }} + yarn_script: ${{ matrix.integ-config.yarn_script || '' }} # e2e-test-runner-headless: # name: E2E test runnner_headless @@ -75,19 +76,3 @@ jobs: test_name: ${{ matrix.integ-config.test_name }} working_directory: ${{ matrix.integ-config.working_directory }} timeout_minutes: ${{ matrix.integ-config.timeout_minutes || 45 }} - - specialized-e2e-test-runner: - name: Specialized E2E test runner - needs: e2e-prep - strategy: - matrix: - integ-config: ${{ fromJson(needs.e2e-prep.outputs.integ-specialized-config) }} - fail-fast: false - secrets: inherit - uses: ./.github/workflows/callable-e2e-test-specialized.yml - with: - test_name: ${{ matrix.integ-config.test_name }} - framework: ${{ matrix.integ-config.framework }} - category: ${{ matrix.integ-config.category }} - sample_name: ${{ toJSON(matrix.integ-config.sample_name) || '[""]' }} - timeout_minutes: ${{ matrix.integ-config.timeout_minutes || 35 }}