moved the regression tests from a separate job to a step of the deploy job

Author: seansteberisal

.github/workflows/base-deploy.yml

@@ -16,7 +16,7 @@ on:
         required: false
         default: "patch"
         type: string
-    secrets: {}
+    secrets: inherit
 
 jobs:
   metadata:

.github/workflows/cicd-2-publish.yaml

@@ -130,12 +130,8 @@ jobs:
             title: "Pushed to main"
             version: "${{ needs.metadata.outputs.version }}"
 
-
-  regression_tests:
-    needs: publish
-    name: Regression Tests
-    uses: ./.github/workflows/regression-tests.yml
-    with:
-      ENVIRONMENT: "dev"
-      VERSION_NUMBER: "main"
-    secrets: inherit
+      - name: Regression Tests
+        uses: ./.github/workflows/regression-tests.yml
+        with:
+          ENVIRONMENT: "dev"
+          VERSION_NUMBER: "main"

.github/workflows/cicd-3-test.yaml

@@ -129,11 +129,9 @@ jobs:
           make terraform env=$ENVIRONMENT stack=api-layer tf-command=apply workspace=$WORKSPACE
         working-directory: ./infrastructure
 
-  regression_tests:
-    needs: deploy
-    name: Regression Tests
-    uses: ./.github/workflows/regression-tests.yml
-    with:
-      ENVIRONMENT: "test"
-      VERSION_NUMBER: "main"
-    secrets: inherit
+      - name: Regression Tests
+        uses: ./.github/workflows/regression-tests.yml
+        with:
+          ENVIRONMENT: "test"
+          VERSION_NUMBER: "main"
+

.github/workflows/cicd-3-test_auto.yaml

@@ -103,11 +103,9 @@ jobs:
           make terraform env=$ENVIRONMENT stack=api-layer tf-command=apply workspace=$WORKSPACE
         working-directory: ./infrastructure
 
-  regression_tests:
-    needs: deploy
-    name: Regression Tests
-    uses: ./.github/workflows/regression-tests.yml
-    with:
-      ENVIRONMENT: "test"
-      VERSION_NUMBER: "main"
-    secrets: inherit
+      - name: Regression Tests
+        uses: ./.github/workflows/regression-tests.yml
+        with:
+          ENVIRONMENT: "test"
+          VERSION_NUMBER: "main"
+

.github/workflows/cicd-4a-preprod-deploy.yml

@@ -23,19 +23,18 @@ on:
           - major
 
 jobs:
-  call:
-    uses: ./.github/workflows/base-deploy.yml
-    with:
-      environment: preprod
-      ref: ${{ inputs.ref }}
-      release_type: ${{ inputs.release_type }}
-    secrets: inherit
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Deploy"
+        uses: ./.github/workflows/base-deploy.yml
+        with:
+          environment: preprod
+          ref: ${{ inputs.ref }}
+          release_type: ${{ inputs.release_type }}
 
-  regression_tests:
-    needs: call
-    name: Regression Tests
-    uses: ./.github/workflows/regression-tests.yml
-    with:
-      ENVIRONMENT: "pre-prod"
-      VERSION_NUMBER: "main"
-    secrets: inherit
+      - name: Regression Tests
+        uses: ./.github/workflows/regression-tests.yml
+        with:
+          ENVIRONMENT: "preprod"
+          VERSION_NUMBER: "main"

.github/workflows/regression-tests.yml

@@ -11,6 +11,7 @@ on:
         type: string
       PRODUCT:
         type: string
+    secrets: inherit
 
 jobs:
   regression-tests: