chore: migrate to GHA

widdix · Oct 6, 2023 · cde15b7 · cde15b7
1 parent 5337c8d
commit cde15b7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/.github/workflows/acceptance-test-run.yml b/.github/workflows/acceptance-test-run.yml
@@ -3,9 +3,6 @@ name: Acceptenace Test Run
 on:
   workflow_call:
     inputs:
-      region:
-        required: true
-        type: string
       tests:
         required: true
         type: string
@@ -31,7 +28,7 @@ jobs:
         role-to-assume: arn:aws:iam::068189904525:role/github-openid-connect
         role-session-name: github-actions-aws-cf-templates
         role-duration-seconds: 21600
-        aws-region: ${{ inputs.region }}
+        aws-region: us-east-1
     - uses: actions/setup-java@v3
       with:
         distribution: corretto
@@ -44,14 +41,13 @@ jobs:
         HOSTED_ZONE_ID: Z2W7RO1VZ3Q66M
         DOMAIN_SUFFIX: awscftemplates.timeseries.guru
         CLOUDFRONT_ACM_CERTIFICATE_ARN: arn:aws:acm:us-east-1:068189904525:certificate/be2a7595-caf3-4c0a-8021-8a3bd70f6e70
-        ACM_CERTIFICATE_ARN: arn:aws:acm:us-east-1:068189904525:certificate/be2a7595-caf3-4c0a-8021-8a3bd70f6e70 # FIXME region specific
-        # FIXME not needed anymore? IAM_ROLE_ARN: arn:aws:iam::068189904525:role/jenkins-aws-cf-templates-tests-Role-1SCN8855CM44J
+        ACM_CERTIFICATE_ARN: arn:aws:acm:us-east-1:068189904525:certificate/be2a7595-caf3-4c0a-8021-8a3bd70f6e70
         TEMPLATE_DIR: ../
-        BUCKET_REGION: eu-west-1
-        BUCKET_NAME: jenkins-aws-cf-templates-tests-templatebucket-1ozdkykh3tc2p
-      run: mvn -B clean test -Dtest=${{ inputs.tests }} -Dsurefire.reportNameSuffix=${{ inputs.region }}
+        BUCKET_REGION: us-east-1
+        BUCKET_NAME: cf-templates-1a2zmgbg9ut4o-us-east-1
+      run: mvn -B clean test -Dtest=${{ inputs.tests }} -Dsurefire.reportNameSuffix=us-east-1
     - uses: actions/upload-artifact@v3
       if: failure()
       with:
-        name: surefire-reports-${{ inputs.region }}
+        name: surefire-reports-us-east-1
         path: test/target/surefire-reports/
diff --git a/.github/workflows/acceptance-test.yml b/.github/workflows/acceptance-test.yml
@@ -73,7 +73,6 @@ jobs:
   acceptance-test:
     uses: ./.github/workflows/acceptance-test-run.yml
     with:
-      region: us-east-1
       tests: ${{ inputs.tests }}
       deletion-policy: ${{ inputs.deletion-policy }}
       failure-policy: ${{ inputs.failure-policy }}
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -17,7 +17,6 @@ jobs:
   acceptance-test:
     uses: ./.github/workflows/acceptance-test-run.yml
     with:
-      region: us-east-1
       tests: '*'
       deletion-policy: delete
       failure-policy: rollback