fix: spelling (#567)

fix: run liquibase after terraform acct and docker steps feat: run smoke on int before full regression - rollback if smoke fails
dvsa · Jan 22, 2025 · 62921da · 62921da
1 parent 0d53702
commit 62921da
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -95,10 +95,10 @@ jobs:
           files: |
             infra/docker/internal/**
       - uses: tj-actions/changed-files@v45
-        id: changed-seaerch-docker-files
+        id: changed-search-docker-files
         with:
           files: |
-            infra/docker/seaerch/**
+            infra/docker/search/**
       - uses: tj-actions/changed-files@v45
         id: changed-accounts-terraform-files
         with:
@@ -412,11 +412,29 @@ jobs:
       pull-requests: write
     secrets: inherit
 
+  test_int_smoke:
+    name: Run Smoke Tests on INT
+    if: ${{ always() && !cancelled() && !failure() && needs.terraform_env_int.result == 'success' }}
+    needs:
+      - terraform_env_int
+    uses: dvsa/vol-functional-tests/.github/workflows/e2eSmoke.yaml@main
+    with:
+      platform_env: int
+      aws_role: ${{ vars.ACCOUNT_NONPROD_TEST_OIDC_ROLE }}
+      bucket_name: ${{ vars.ACCOUNT_NONPROD_S3_REPORT_BUCKET }}
+      bucket_key: ${{ vars.S3_REPORT_BUCKET_KEY }}
+      batch_job_queue: ${{ vars.ACCOUNT_NONPROD_BATCH_JOB_QUEUE }}
+      batch_job_definition: ${{ vars.ACCOUNT_NONPROD_BATCH_JOB_DEFINITION }}
+    permissions:
+      contents: write
+      id-token: write
+      checks: write
+
   test_int_selfserve:
     if: ${{ always() && !cancelled() && !failure() && needs.terraform_env_int.result == 'success' }}
     name: Run Selfserve Regression Tests on INT
     needs:
-      - terraform_env_int
+      - test_int_smoke
     uses: dvsa/vol-functional-tests/.github/workflows/e2eSelfServeRegression.yaml@main
     with:
       platform_env: int
@@ -434,7 +452,7 @@ jobs:
     if: ${{ always() && !cancelled() && !failure() && needs.terraform_env_int.result == 'success' }}
     name: Run Internal Regression Tests on INT
     needs:
-      - terraform_env_int
+      - test_int_smoke
     uses: dvsa/vol-functional-tests/.github/workflows/e2eInternalRegression.yaml@main
     with:
       platform_env: int
@@ -452,10 +470,12 @@ jobs:
     name: Rollback INT Deployment
     if: |
       always() &&
-      (needs.test_int_selfserve.result == 'failure' || needs.test_int_selfserve.result == 'cancelled' ||
+      (needs.test_int_smoke.result == 'failure' || needs.test_int_smoke.result == 'cancelled' ||
+       needs.test_int_selfserve.result == 'failure' || needs.test_int_selfserve.result == 'cancelled' ||
        needs.test_int_internal.result == 'failure' || needs.test_int_internal.result == 'cancelled') &&
        needs.terraform_env_int.result == 'success'
     needs:
+      - test_int_smoke
       - test_int_selfserve
       - test_int_internal
       - terraform_env_int

diff --git a/app/api/.gitignore b/app/api/.gitignore
@@ -26,4 +26,4 @@ phpcs.xml
 phpstan.neon
 phpunit.xml
 psalm.xml
-# Trigger CD - 2024-11-25-1350
+# Trigger CD - 2025-01-22-1540
diff --git a/infra/docker/search/Dockerfile b/infra/docker/search/Dockerfile
@@ -11,4 +11,3 @@ COPY entrypoint.sh /usr/share/logstash/entrypoint.sh
 COPY build.sh /usr/share/logstash/build.sh
 
 CMD ["/usr/share/logstash/entrypoint.sh"]
-# deploy
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,3 @@ COPY entrypoint.sh /usr/share/logstash/entrypoint.sh
		COPY build.sh /usr/share/logstash/build.sh

		CMD ["/usr/share/logstash/entrypoint.sh"]
		# deploy