Merge branch 'main' of https://github.com/bcgov/EDUC-GRAD-ADMIN into …

…release/v1.27.0
bcgov · Dec 17, 2024 · 2a5cfb5 · 2a5cfb5
2 parents 947c315 + 9cfbe5f
commit 2a5cfb5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml b/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml
@@ -31,7 +31,7 @@ env:
   MAX_REPLICAS: "2"
 
   # SITE_URL should have no scheme or port. It will be prepended with https://
-  HOST_ROUTE: "educ-grad-admin-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca"
+  HOST_ROUTE: "educ-grad-admin-${{ secrets.UI_NAMESPACE }}-dev.apps.silver.devops.gov.bc.ca"
 
 on:
   workflow_dispatch:

diff --git a/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml b/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml
@@ -35,7 +35,7 @@ env:
   MAX_REPLICAS: "5"
 
   # SITE_URL should have no scheme or port. It will be prepended with https://
-  HOST_ROUTE: "educ-grad-admin-bbe4c3-dev.apps.silver.devops.gov.bc.ca"
+  HOST_ROUTE: "educ-grad-admin-${{ secrets.UI_NAMESPACE }}-dev.apps.silver.devops.gov.bc.ca"
 
 on:
   workflow_dispatch:

diff --git a/.github/workflows/deploy-backend-to-ocp-prod.yml b/.github/workflows/deploy-backend-to-ocp-prod.yml
@@ -30,7 +30,7 @@ env:
   MAX_REPLICAS: "5"
 
   # SITE_URL should have no scheme or port. It will be prepended with https://
-  HOST_ROUTE: "educ-grad-admin-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca"
+  HOST_ROUTE: "educ-grad-admin-${{ secrets.UI_NAMESPACE }}-prod.apps.silver.devops.gov.bc.ca"
 
 on:
   workflow_dispatch:

diff --git a/.github/workflows/deploy-backend-to-ocp-test.yml b/.github/workflows/deploy-backend-to-ocp-test.yml
@@ -30,7 +30,7 @@ env:
   MAX_REPLICAS: "5"
 
   # SITE_URL should have no scheme or port. It will be prepended with https://
-  HOST_ROUTE: "educ-grad-admin-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca"
+  HOST_ROUTE: "educ-grad-admin-${{ secrets.UI_NAMESPACE }}-test.apps.silver.devops.gov.bc.ca"
 
 on:
   workflow_dispatch:
@@ -110,4 +110,4 @@ jobs:
       - name: ZAP Scan
         uses: zaproxy/[email protected]
         with:
-          target: "https://educ-grad-admin-bbe4c3-test.apps.silver.devops.gov.bc.ca"
+          target: "https://educ-grad-admin-${{ secrets.UI_NAMESPACE }}-test.apps.silver.devops.gov.bc.ca"
diff --git a/.github/workflows/deploy-frontend-to-ocp-prod.yml b/.github/workflows/deploy-frontend-to-ocp-prod.yml
@@ -33,7 +33,7 @@ env:
   MAX_REPLICAS: "5"
 
   # SITE_URL should have no scheme or port. It will be prepended with https://
-  HOST_ROUTE: "educ-grad-admin-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca"
+  HOST_ROUTE: "educ-grad-admin-${{ secrets.UI_NAMESPACE }}-prod.apps.silver.devops.gov.bc.ca"
 
 on:
   workflow_dispatch:

diff --git a/.github/workflows/deploy-frontend-to-ocp-test.yml b/.github/workflows/deploy-frontend-to-ocp-test.yml
@@ -33,7 +33,7 @@ env:
   MAX_REPLICAS: "5"
 
   # SITE_URL should have no scheme or port. It will be prepended with https://
-  HOST_ROUTE: "educ-grad-admin-bbe4c3-test.apps.silver.devops.gov.bc.ca"
+  HOST_ROUTE: "educ-grad-admin-${{ secrets.UI_NAMESPACE }}-test.apps.silver.devops.gov.bc.ca"
 
 on:
   workflow_dispatch:
@@ -101,4 +101,4 @@ jobs:
       - name: ZAP Scan
         uses: zaproxy/[email protected]
         with:
-          target: "https://educ-grad-admin-bbe4c3-test.apps.silver.devops.gov.bc.ca"
+          target: "https://educ-grad-admin-${{ secrets.UI_NAMESPACE }}-test.apps.silver.devops.gov.bc.ca"