CR feedback

bcgov · Nov 28, 2024 · 5c73a71 · 5c73a71
1 parent c6b2a89
commit 5c73a71
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/.github/workflows/retag-test-to-uat-argo.yml b/.github/workflows/retag-test-to-uat-argo.yml
@@ -171,6 +171,7 @@ jobs:
           VERSION=$(make version)
           oc tag pims-app:uat pims-app:v${VERSION}-master
           oc tag pims-api:uat pims-api:v${VERSION}-master
+          oc tag pims-proxy:uat pims-proxy:v${VERSION}-master
           oc tag mayan-bcgov:uat mayan-bcgov:v${VERSION}-master
 
   ci-cd-end-notification:

diff --git a/.github/workflows/retag-test-to-uat.yml b/.github/workflows/retag-test-to-uat.yml
@@ -28,6 +28,7 @@ env:
   INSTANCE: "-uat"
   NAMESPACE_OVERRIDE: "3cd915-test"
   RELEASE_TAG: "test"
+  DEPLOYMENT_NAMESPACE: "3cd915-test"
 
 on: workflow_dispatch
 
@@ -64,6 +65,13 @@ jobs:
           ./openshift/4.0/player.sh deploy api $DESTINATION -apply
           ./openshift/4.0/player.sh deploy app $DESTINATION -apply
           oc tag mayan-bcgov:test mayan-bcgov:$DESTINATION
+      # the proxy can only be deployed via DEPLOYMENTS (ArgoCD way)
+      - name: Deploy geoserver proxy microservice
+        shell: bash
+        run: |
+          oc tag pims-proxy:$RELEASE_TAG pims-proxy:$DESTINATION
+          oc -n $DEPLOYMENT_NAMESPACE rollout restart deployment/pims-proxy-$DESTINATION
+          oc -n $DEPLOYMENT_NAMESPACE rollout status --timeout=600s deployment/pims-proxy-$DESTINATION
 
   # the command:
   # 1) creates an openshift job with generated name to avoid name conflict, substituting the variables in the template.
@@ -153,6 +161,7 @@ jobs:
           VERSION=$(make version)
           oc tag pims-app:uat pims-app:v${VERSION}-master
           oc tag pims-api:uat pims-api:v${VERSION}-master
+          oc tag pims-proxy:uat pims-proxy:v${VERSION}-master
           oc tag mayan-bcgov:uat mayan-bcgov:v${VERSION}-master
 
   ci-cd-end-notification:

diff --git a/.github/workflows/uat_hotfix_argo.yml b/.github/workflows/uat_hotfix_argo.yml
@@ -202,6 +202,8 @@ jobs:
           VERSION=$(make version)
           oc tag pims-app:uat pims-app:v${VERSION}-master
           oc tag pims-api:uat pims-api:v${VERSION}-master
+          oc tag pims-proxy:uat pims-proxy:v${VERSION}-master
+          oc tag mayan-bcgov:uat mayan-bcgov:v${VERSION}-master
 
   ci-cd-end-notification:
     if: always()