feat: retry e2e tests at the action level

.github/actions/run_with_e2e_account/action.yml

@@ -24,6 +24,14 @@ inputs:
     default: false
   cdk-lib-version:
     required: true
+  retry_attempts:
+    description: Number of retry attempts for the main script
+    required: false
+    default: '3'
+  retry_delay:
+    description: Delay between retry attempts in seconds
+    required: false
+    default: '30'
 runs:
   using: composite
   steps:
@@ -76,9 +84,53 @@ runs:
       with:
         role-to-assume: ${{ steps.selectE2EAccount.outputs.e2e_execution_role }}
         aws-region: ${{ steps.selectE2ERegion.outputs.selected_aws_region }}
-    - name: Run script
-      shell: ${{ inputs.shell }}
-      run: ${{ inputs.run }}
+    - name: Run script with retry
+      shell: bash
+      run: |
+        set -e
+
+        # Set default shell if not provided
+        SHELL_CMD="${{ inputs.shell }}"
+        if [ -z "$SHELL_CMD" ]; then
+          SHELL_CMD="bash"
+        fi
+
+        # Retry logic
+        RETRY_ATTEMPTS=${{ inputs.retry_attempts }}
+        RETRY_DELAY=${{ inputs.retry_delay }}
+        ATTEMPT=1
+
+        while [ $ATTEMPT -le $RETRY_ATTEMPTS ]; do
+          echo "Attempt $ATTEMPT of $RETRY_ATTEMPTS"
+
+          if [ "$SHELL_CMD" = "bash" ]; then
+            if bash -c '${{ inputs.run }}'; then
+              echo "Script succeeded on attempt $ATTEMPT"
+              exit 0
+            fi
+          elif [ "$SHELL_CMD" = "pwsh" ]; then
+            if pwsh -c '${{ inputs.run }}'; then
+              echo "Script succeeded on attempt $ATTEMPT"
+              exit 0
+            fi
+          else
+            # Default to bash for other shells
+            if bash -c '${{ inputs.run }}'; then
+              echo "Script succeeded on attempt $ATTEMPT"
+              exit 0
+            fi
+          fi
+
+          if [ $ATTEMPT -lt $RETRY_ATTEMPTS ]; then
+            echo "Script failed on attempt $ATTEMPT. Retrying in $RETRY_DELAY seconds..."
+            sleep $RETRY_DELAY
+          else
+            echo "Script failed after $RETRY_ATTEMPTS attempts"
+            exit 1
+          fi
+
+          ATTEMPT=$((ATTEMPT + 1))
+        done
       env:
         AWS_REGION: ${{ steps.selectE2ERegion.outputs.selected_aws_region }}
         AMPLIFY_BACKEND_TESTS_E2E_EXECUTION_ROLE_ARN: ${{ steps.selectE2EAccount.outputs.e2e_execution_role }}

.github/workflows/health_checks.yml

@@ -489,22 +489,6 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # version 4.1.4
-      - name: Run e2e deployment tests with retry
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: ${{ matrix.os == 'windows-2025' && 35 || 25 }}
-          max_attempts: 3
-          retry_wait_seconds: 30
-          shell: bash
-          command: |
-            # Setup node and restore cache
-            echo "Setting up Node.js and restoring cache..."
-
-            # Run the e2e deployment tests using the action
-            echo "Running e2e deployment tests..."
-
-            # This will be handled by the composite action call below
-            exit 0
       - name: Execute e2e deployment tests
         uses: ./.github/actions/run_with_e2e_account
         with:
@@ -558,17 +542,6 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # version 4.1.4
-      - name: Run e2e sandbox tests with retry
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: ${{ matrix.os == 'windows-2025' && 35 || 25 }}
-          max_attempts: 3
-          retry_wait_seconds: 30
-          shell: bash
-          command: |
-            # This step will be handled by the composite action below
-            echo "Preparing to run e2e sandbox tests with retry..."
-            exit 0
       - name: Execute e2e sandbox tests
         uses: ./.github/actions/run_with_e2e_account
         with:
@@ -606,7 +579,12 @@ jobs:
           cdk-lib-version: ${{ needs.resolve_inputs.outputs.cdk_lib_version }}
       - run: cd packages/cli && npm link
       - name: Run e2e notices tests
-        run: npm run test:dir packages/integration-tests/lib/test-e2e/notices.test.js
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: ${{ matrix.os == 'windows-2025' && 8 || 5 }}
+          max_attempts: 3
+          retry_wait_seconds: 30
+          command: npm run test:dir packages/integration-tests/lib/test-e2e/notices.test.js
   e2e_backend_output:
     if: needs.do_include_e2e.outputs.run_e2e == 'true'
     runs-on: ubuntu-latest
@@ -689,17 +667,6 @@ jobs:
     steps:
       - name: Checkout aws-amplify/amplify-backend repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Run e2e package manager tests with retry
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: ${{ matrix.os == 'windows-2025' && 40 || 25 }}
-          max_attempts: 3
-          retry_wait_seconds: 30
-          shell: bash
-          command: |
-            # This step will be handled by the composite action below
-            echo "Preparing to run e2e package manager tests with retry..."
-            exit 0
       - name: Execute e2e package manager tests
         uses: ./.github/actions/run_with_e2e_account
         with: