Automated sync with upstream - last commit 4720a26 - run #21.1 (#89)

* Reduce Name Of EC2LinuxIntegrationTest To Show More Test Info In GHA (#666) * nick-invision/retry@v2 Became nick-fields/retry@v2 Fix ECSEC2LaunchDa… (#669) Co-authored-by: Seth L <[email protected]>
aws · Jan 23, 2023 · 9e2870c · 9e2870c
1 parent 92f095d
commit 9e2870c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/.github/workflows/integrationTest.yml b/.github/workflows/integrationTest.yml
@@ -454,6 +454,7 @@ jobs:
             if terraform apply --auto-approve \
               -var="ssh_key_value=${PRIVATE_KEY}" -var="github_test_repo=${{env.CWA_GITHUB_TEST_REPO_URL}}" \
               -var="cwa_github_sha=${GITHUB_SHA}" -var="install_agent=${{ matrix.arrays.installAgentCommand }}" \
+              -var="github_test_repo_branch=${{env.CWA_GITHUB_TEST_REPO_BRANCH}}" \
               -var="ec2_instance_type=${{ matrix.arrays.instanceType }}" \
               -var="user=${{ matrix.arrays.username }}" \
               -var="ami=${{ matrix.arrays.ami }}" \
@@ -508,7 +509,7 @@ jobs:
 
   EC2LinuxIntegrationTest:
     needs: [MakeBinary, StartLocalStack, GenerateTestMatrix]
-    name: 'EC2LinuxIntegrationTest'
+    name: 'Test'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -548,14 +549,15 @@ jobs:
         uses: nick-fields/retry@v2
         with:
           max_attempts: 3
-          timeout_minutes: 30
+          timeout_minutes: 60
           retry_wait_seconds: 5
           command: |
             cd terraform/ec2/linux
             terraform init
             if terraform apply --auto-approve \
               -var="ssh_key_value=${PRIVATE_KEY}" -var="github_test_repo=${{env.CWA_GITHUB_TEST_REPO_URL}}" \
               -var="cwa_github_sha=${GITHUB_SHA}" -var="install_agent=${{ matrix.arrays.installAgentCommand }}" \
+              -var="github_test_repo_branch=${{env.CWA_GITHUB_TEST_REPO_BRANCH}}" \
               -var="ec2_instance_type=${{ matrix.arrays.instanceType }}" \
               -var="user=${{ matrix.arrays.username }}" \
               -var="ami=${{ matrix.arrays.ami }}" \
@@ -717,7 +719,7 @@ jobs:
 
       - name: Terraform apply
         if: steps.ecs-ec2-launch-daemon-integration-test.outputs.cache-hit != 'true'
-        uses: nick-invision/retry@v2
+        uses: nick-fields/retry@v2
         with:
           max_attempts: 3
           timeout_minutes: 15
@@ -738,7 +740,7 @@ jobs:
 
       - name: Terraform destroy
         if: ${{ cancelled() && steps.ecs-ec2-launch-integration-test.outputs.cache-hit != 'true' }}
-        uses: nick-invision/retry@v2
+        uses: nick-fields/retry@v2
         with:
           max_attempts: 3
           timeout_minutes: 8