From 8ef4c2c168d7fd1d1621f24a452763d7e61f4ac3 Mon Sep 17 00:00:00 2001
From: Mulder <Willem.Mulder@gov.bc.ca>
Date: Wed, 24 Apr 2024 08:08:30 -0700
Subject: [PATCH] DBC22-2081:Fix test workflows

---
 .github/workflows/test.yml        | 5 +++--
 .github/workflows/test_manual.yml | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 060ce9d42..441f2d403 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -185,6 +185,7 @@ jobs:
         password: ${{ env.REGISTRY_PASSWORD }}
 
   build-logprocessing:
+    needs: [build-pre]
     runs-on: ubuntu-latest
     name: Build & Push Docker Log-Processing Image
     environment: test
@@ -201,7 +202,7 @@ jobs:
         tags: latest latest-test ${{ github.sha }}
         labels: |
           app=drivebc
-        containerfiles: ./compose/logprocessing/Dockerfile
+        containerfiles: ./compose/logprocessing/DockerFile
 
     - name: Push to Github Packages
       uses: redhat-actions/push-to-registry@v2.7
@@ -236,4 +237,4 @@ jobs:
     - name: Helm upgrade on OpenShift Environment
       run: |
         helm dependency update ./infrastructure/main
-        helm upgrade test-drivebc -f ./infrastructure/main/values-test.yaml ./infrastructure/main --set django.image.tag="${{ needs.build-pre.outputs.tag }}" --set image-caching.image.tag="${{ needs.build-pre.outputs.tag }}" --set redis.image.tag="${{ needs.build-pre.outputs.tag }}" --set static.image.tag="${{ needs.build-pre.outputs.tag }}" --set tasks.image.tag="${{ needs.build-pre.outputs.tag }} --set logprocessing.image.tag="${{ needs.build-pre.outputs.tag }}"
+        helm upgrade test-drivebc -f ./infrastructure/main/values-test.yaml ./infrastructure/main --set django.image.tag="${{ needs.build-pre.outputs.tag }}" --set image-caching.image.tag="${{ needs.build-pre.outputs.tag }}" --set redis.image.tag="${{ needs.build-pre.outputs.tag }}" --set static.image.tag="${{ needs.build-pre.outputs.tag }}" --set tasks.image.tag="${{ needs.build-pre.outputs.tag }}" --set logprocessing.image.tag="${{ needs.build-pre.outputs.tag }}"
diff --git a/.github/workflows/test_manual.yml b/.github/workflows/test_manual.yml
index a45185483..eb9f9bc7e 100644
--- a/.github/workflows/test_manual.yml
+++ b/.github/workflows/test_manual.yml
@@ -164,9 +164,10 @@ jobs:
         password: ${{ env.REGISTRY_PASSWORD }}
 
   build-logprocessing:
+    needs: [build-pre]
     runs-on: ubuntu-latest
     name: Build & Push Docker Log-Processing Image
-    environment: dev
+    environment: test
     
     steps:
     - name: Checkout Code
@@ -177,10 +178,10 @@ jobs:
       uses: redhat-actions/buildah-build@v2.9
       with:
         image: drivebc-logprocessing
-        tags: latest latest-dev ${{ github.sha }}
+        tags: latest latest-test ${{ github.sha }}
         labels: |
           app=drivebc
-        containerfiles: ./compose/logprocessing/Dockerfile
+        containerfiles: ./compose/logprocessing/DockerFile
   
     - name: Push to Github Packages
       uses: redhat-actions/push-to-registry@v2.7
@@ -215,4 +216,4 @@ jobs:
     - name: Helm upgrade on OpenShift Environment
       run: |
         helm dependency update ./infrastructure/main
-        helm upgrade test-drivebc -f ./infrastructure/main/values-test.yaml ./infrastructure/main --set django.image.tag="${{ needs.build-pre.outputs.tag }}" --set image-caching.image.tag="${{ needs.build-pre.outputs.tag }}" --set redis.image.tag="${{ needs.build-pre.outputs.tag }}" --set static.image.tag="${{ needs.build-pre.outputs.tag }}" --set tasks.image.tag="${{ needs.build-pre.outputs.tag }}"
+        helm upgrade test-drivebc -f ./infrastructure/main/values-test.yaml ./infrastructure/main --set django.image.tag="${{ needs.build-pre.outputs.tag }}" --set image-caching.image.tag="${{ needs.build-pre.outputs.tag }}" --set redis.image.tag="${{ needs.build-pre.outputs.tag }}" --set static.image.tag="${{ needs.build-pre.outputs.tag }}" --set tasks.image.tag="${{ needs.build-pre.outputs.tag }}" --set logprocessing.image.tag="${{ needs.build-pre.outputs.tag }}"
\ No newline at end of file