Merge pull request #422 from bcgov/feature/workflowFix

workflow fixes
bcgov · May 23, 2023 · 268af4d · 268af4d
2 parents c262b70 + c624a0e
commit 268af4d
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 55 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -17,10 +17,6 @@ on:
           - figaro-validation-service
           - spd-notification-worker
           - vips-notification-worker
-      source_image_tag:
-        required: true
-        description: What is the tag that is going to be promoted?
-        type: string
       environment:
         required: true
         description: What is the targeted environment?
@@ -31,15 +27,39 @@ on:
           - prod
 
 jobs:
-  promote_image:
-    uses: SierraSystems/reusable-workflows/.github/workflows/openshift-tag-image.yml@main
+  build-and-push-image:
+    needs:
+      - unit-test
+      - app-version
+    uses: SierraSystems/reusable-workflows/.github/workflows/docker-build-and-push-image.yml@main
     with:
-      image_stream_name: "${{ github.event.inputs.app_name }}"
-      source_image_tag: "${{ github.event.inputs.source_image_tag }}"
-      image_tags: "${{ github.event.inputs.environment }}"
+      app_name: "${{ github.event.inputs.app_name }}"
+      working_directory: .
+      image_tags: "dev,${{ needs.app-version.outputs.app-version }}"
+      env: tools
+      build_args: |-
+        DPS_SERVICE_NAME="${{ github.event.inputs.app_name }}"
+        MVN_PROFILES="${{ github.event.inputs.app_name }}",openshift
     secrets:
-      openshift_namespace: "${{ secrets.OPENSHIFT_LICENSE_PLATE_SILVER }}-tools"
       openshift_server_url: "${{ secrets.OPENSHIFT_SERVER_URL_SILVER }}"
       openshift_token: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}"
       openshift_external_repository: "${{ secrets.OPENSHIFT_EXTERNAL_REPOSITORY_SILVER }}"
+      openshift_license_plate: "${{ secrets.OPENSHIFT_LICENSE_PLATE_SILVER }}"
+      docker_username: "${{ secrets.DOCKER_USERNAME }}"
+      docker_password: "${{ secrets.DOCKER_PASSWORD }}"
 
+  trivy:
+    needs:
+      - app-version
+      - build-image
+    uses: SierraSystems/reusable-workflows/.github/workflows/trivy-scan-openshift-image.yml@main
+    with:
+      imagestream_name: "dps-email-poller"
+      image_tag: "${{ needs.app-version.outputs.app-version }}"
+    secrets:
+      openshift_external_repository: "${{ secrets.OPENSHIFT_EXTERNAL_REPOSITORY_SILVER }}"
+      openshift_namespace: "${{ secrets.OPENSHIFT_LICENSE_PLATE_SILVER }}-tools"
+      openshift_sa_name: "${{ secrets.OPENSHIFT_SA_PIPELINE_PASSWORD_SILVER }}"
+      openshift_sa_password: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}"
+      openshift_server_url: "${{ secrets.OPENSHIFT_SERVER_URL_SILVER }}"
+      openshift_token: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}"
diff --git a/.github/workflows/dev-dps-email-poller.yml b/.github/workflows/dev-dps-email-poller.yml
@@ -33,11 +33,6 @@ jobs:
     with:
       app_name: "dps-email-poller"
       working_directory: .
-      image_tags: "dev,${{ needs.app-version.outputs.app-version }}"
-      env: tools
-      build_args: |-
-        DPS_SERVICE_NAME=dps-email-poller
-        MVN_PROFILES=dps-email-poller,openshift
     secrets:
       openshift_server_url: "${{ secrets.OPENSHIFT_SERVER_URL_SILVER }}"
       openshift_token: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}"

diff --git a/.github/workflows/dev-dps-notification-service.yml b/.github/workflows/dev-dps-notification-service.yml
@@ -33,11 +33,6 @@ jobs:
     with:
       app_name: "dps-notification-service"
       working_directory: .
-      image_tags: "dev,${{ needs.app-version.outputs.app-version }}"
-      env: tools
-      build_args: |-
-        DPS_SERVICE_NAME=dps-notification-service
-        MVN_PROFILES=dps-notification-service,openshift
     secrets:
       openshift_server_url: "${{ secrets.OPENSHIFT_SERVER_URL_SILVER }}"
       openshift_token: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}"

diff --git a/.github/workflows/dev-dps-payment-service.yml b/.github/workflows/dev-dps-payment-service.yml
@@ -33,11 +33,6 @@ jobs:
     with:
       app_name: "dps-payment-service"
       working_directory: .
-      image_tags: "dev,${{ needs.app-version.outputs.app-version }}"
-      env: tools
-      build_args: |-
-        DPS_SERVICE_NAME=dps-payment-service
-        MVN_PROFILES=dps-payment-service,openshift
     secrets:
       openshift_server_url: "${{ secrets.OPENSHIFT_SERVER_URL_SILVER }}"
       openshift_token: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}"

diff --git a/.github/workflows/dev-dps-registration-api.yml b/.github/workflows/dev-dps-registration-api.yml
@@ -33,11 +33,6 @@ jobs:
     with:
       app_name: "dps-registration-api"
       working_directory: .
-      image_tags: "dev,${{ needs.app-version.outputs.app-version }}"
-      env: tools
-      build_args: |-
-        DPS_SERVICE_NAME=dps-registration-api
-        MVN_PROFILES=dps-registration-api,openshift
     secrets:
       openshift_server_url: "${{ secrets.OPENSHIFT_SERVER_URL_SILVER }}"
       openshift_token: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}"

diff --git a/.github/workflows/dev-dps-validation-service.yml b/.github/workflows/dev-dps-validation-service.yml
@@ -33,11 +33,6 @@ jobs:
     with:
       app_name: "dps-validation-service"
       working_directory: .
-      image_tags: "dev,${{ needs.app-version.outputs.app-version }}"
-      env: tools
-      build_args: |-
-        DPS_SERVICE_NAME=dps-validation-service
-        MVN_PROFILES=dps-validation-service,openshift
     secrets:
       openshift_server_url: "${{ secrets.OPENSHIFT_SERVER_URL_SILVER }}"
       openshift_token: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}"

diff --git a/.github/workflows/dev-email-worker.yml b/.github/workflows/dev-email-worker.yml
@@ -33,11 +33,6 @@ jobs:
     with:
       app_name: "dps-email-worker"
       working_directory: .
-      image_tags: "dev,${{ needs.app-version.outputs.app-version }}"
-      env: tools
-      build_args: |-
-        DPS_SERVICE_NAME=dps-email-worker
-        MVN_PROFILES=dps-email-worker,openshift
     secrets:
       openshift_server_url: "${{ secrets.OPENSHIFT_SERVER_URL_SILVER }}"
       openshift_token: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}"

diff --git a/.github/workflows/dev-figaro-validation-service.yml b/.github/workflows/dev-figaro-validation-service.yml
@@ -33,11 +33,6 @@ jobs:
     with:
       app_name: "figaro-validation-service"
       working_directory: .
-      image_tags: "dev,${{ needs.app-version.outputs.app-version }}"
-      env: tools
-      build_args: |-
-        DPS_SERVICE_NAME=figaro-validation-service
-        MVN_PROFILES=figaro-validation-service,openshift
     secrets:
       openshift_server_url: "${{ secrets.OPENSHIFT_SERVER_URL_SILVER }}"
       openshift_token: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}"

diff --git a/.github/workflows/dev-spd-notification-worker.yml b/.github/workflows/dev-spd-notification-worker.yml
@@ -33,11 +33,6 @@ jobs:
     with:
       app_name: "spd-notification-worker"
       working_directory: .
-      image_tags: "dev,${{ needs.app-version.outputs.app-version }}"
-      env: tools
-      build_args: |-
-        DPS_SERVICE_NAME=spd-notification-worker
-        MVN_PROFILES=spd-notification-worker,openshift
     secrets:
       openshift_server_url: "${{ secrets.OPENSHIFT_SERVER_URL_SILVER }}"
       openshift_token: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}"

diff --git a/.github/workflows/dev-vips-notification-worker.yml b/.github/workflows/dev-vips-notification-worker.yml
@@ -33,11 +33,6 @@ jobs:
     with:
       app_name: "vips-notification-worker"
       working_directory: .
-      image_tags: "dev,${{ needs.app-version.outputs.app-version }}"
-      env: tools
-      build_args: |-
-        DPS_SERVICE_NAME=vips-notification-worker
-        MVN_PROFILES=vips-notification-worker,openshift
     secrets:
       openshift_server_url: "${{ secrets.OPENSHIFT_SERVER_URL_SILVER }}"
       openshift_token: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}"