bcgov · JamesPasta · Jul 29, 2026 · Jul 28, 2026 · Jul 28, 2026 · Jul 28, 2026
diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
@@ -24,7 +24,9 @@ env:
   GH_TOKEN: ${{secrets.GH_API_TOKEN}}
   OC_CLUSTER: ${{ vars.OPENSHIFT_CLUSTER }}
   OC_REGISTRY: ${{ vars.OPENSHIFT_REGISTRY }}
-  OC_AUTH_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
+  OC_TOOLS_TOKEN: ${{ secrets.TOOLS_OPENSHIFT_TOKEN }}
+  OC_TOOLS_PROJECT: ${{ vars.TOOLS_OPENSHIFT_NAMESPACE }}
+  OC_TARGET_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
   OC_TARGET_PROJECT: ${{ vars.OPENSHIFT_NAMESPACE }}
   JFROG_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
   JFROG_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
@@ -47,7 +49,7 @@ jobs:
       run: |
         echo "Target: $TARGET_ENV"
         echo "BaseRef: $GITHUB_REF_NAME"
-        echo "Environment: $TARGET_ENV OC_TARGET_PROJECT=$OC_TARGET_PROJECT"
+        echo "Environment: $TARGET_ENV OC_TOOLS_PROJECT=$OC_TOOLS_PROJECT OC_TARGET_PROJECT=$OC_TARGET_PROJECT"
         echo "Environment: $TARGET_ENV JFROG_REPO_PATH=$JFROG_REPO_PATH"
         echo "..."
         env | sort
@@ -124,36 +126,46 @@ jobs:
         docker build --build-arg UNITY_BUILD_VERSION=${{env.UGM_BUILD_VERSION}} --build-arg UNITY_BUILD_REVISION=${{env.UGM_BUILD_REVISION}} -t unity-grantmanager-web -f src/Unity.GrantManager.Web/Dockerfile .
         docker build -t unity-grantmanager-dbmigrator -f src/Unity.GrantManager.DbMigrator/Dockerfile .
       working-directory: ./applications/Unity.GrantManager
-    - name: Connect to JFrog Artifactory non-interactive login using --password-stdin
-      run: |
-        echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
     - name: Push application images to Artifactory container registry
+      continue-on-error: true
       run: |
+        echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
         docker tag unity-grantmanager-dbmigrator $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
         docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
         docker tag unity-grantmanager-web $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
         docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
-    - name: Disconnect docker from JFrog Artifactory
-      run: |
-        docker logout
+        docker logout $JFROG_SERVICE
     - name: Install OpenShift CLI
       run: |
           curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz
           tar -xvf oc.tar.gz
           sudo mv oc /usr/local/bin
     - name: Verify OpenShift CLI installation
       run: oc version
-    - name: Connect to OpenShift API non-interactive login using current session token
+    - name: Push application images into ce395f-tools
       run: |
-        oc login --token=$OC_AUTH_TOKEN --server=$OC_CLUSTER
+        oc login --token=$OC_TOOLS_TOKEN --server=$OC_CLUSTER
         oc registry login
         docker login -u unused -p $(oc whoami -t) $OC_REGISTRY
-    - name: Push application images to OpenShift container registry
+        docker tag unity-grantmanager-dbmigrator $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:latest
+        docker push $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:latest
+        docker tag unity-grantmanager-web $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:latest
+        docker push $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:latest
+        docker logout $OC_REGISTRY
+    - name: Promote dbMigrator into ce395f-dev and run migrations
       run: |
-        docker tag unity-grantmanager-dbmigrator $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-dbmigrator
-        docker push $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-dbmigrator
-        docker tag unity-grantmanager-web $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-web
-        docker push $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-web
-    - name: Disconnect docker from OpenShift container registry
+        oc login --token=$OC_TARGET_TOKEN --server=$OC_CLUSTER
+        oc tag $OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:latest $OC_TARGET_PROJECT/$TARGET_ENV-unity-dbmigrator:latest
+        oc -n $OC_TARGET_PROJECT delete jobs $TARGET_ENV-unity-dbmigrator --ignore-not-found=true
+        oc -n $OC_TARGET_PROJECT process unity-grantmanager-dbmigrator-job \
+          -p APPLICATION_GROUP=$TARGET_ENV-unity-grantmanager \
+          -p DATABASE_SERVICE_NAME=$TARGET_ENV-unity-data-postgres \
+          -p APPLICATION_NAME=$TARGET_ENV-unity-dbmigrator \
+          -p IMAGEPULL_NAMESPACE=$OC_TARGET_PROJECT \
+          -p IMAGESTREAM_NAME=$TARGET_ENV-unity-dbmigrator \
+          -p IMAGESTREAM_TAG=latest | oc -n $OC_TARGET_PROJECT create -f -
+        oc -n $OC_TARGET_PROJECT wait jobs/$TARGET_ENV-unity-dbmigrator --for condition=complete --timeout=300s
+    - name: Promote grantmanager-web into ce395f-dev and wait
       run: |
-        docker logout
+        oc tag $OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:latest $OC_TARGET_PROJECT/$TARGET_ENV-unity-grantmanager:latest
+        oc -n $OC_TARGET_PROJECT rollout status deployment/$TARGET_ENV-unity-grantmanager-web --timeout=180s
diff --git a/.github/workflows/docker-build-dev2.yml b/.github/workflows/docker-build-dev2.yml
@@ -0,0 +1,124 @@
+name: Dev2 - Build & Push docker images
+
+on:
+  push:
+    branches: [ "dev2" ]
+    paths-ignore:
+      - '.github/**'
+      - '.gitignore'
+      - 'database/**'
+      - 'documentation/**'
+      - '**/docs/**'
+      - '**/README*'
+      - 'CODE_OF_CONDUCT.md'
+      - 'COMPLIANCE.yaml'
+      - 'CONTRIBUTING.md'
+      - 'LICENSE'
+      - 'README.md'
+      - 'SECURITY.md'
+  # Allow manual workflow triggering
+  workflow_dispatch:
+
+env:
+  TARGET_ENV: dev2
+  GH_TOKEN: ${{secrets.GH_API_TOKEN}}
+  OC_CLUSTER: ${{ vars.OPENSHIFT_CLUSTER }}
+  OC_REGISTRY: ${{ vars.OPENSHIFT_REGISTRY }}
+  OC_TARGET_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
+  OC_TARGET_PROJECT: ${{ vars.OPENSHIFT_NAMESPACE }}
+  JFROG_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+  JFROG_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+  JFROG_REPO_PATH: ${{ vars.ARTIFACTORY_REPO }}
+  JFROG_SERVICE:  ${{ vars.ARTIFACTORY_SERVICE }}
+
+jobs:
+  Setup:
+    runs-on: ubuntu-latest
+    environment: dev2
+    permissions:
+      contents: read
+    steps:
+    - name: Get variables
+      run: |
+        echo "Target: $TARGET_ENV"
+        echo "BaseRef: $GITHUB_REF_NAME"
+        echo "Environment: $TARGET_ENV OC_TARGET_PROJECT=$OC_TARGET_PROJECT"
+        echo "Environment: $TARGET_ENV JFROG_REPO_PATH=$JFROG_REPO_PATH"
+        echo "..."
+        env | sort
+  Branch:
+    needs: [Setup]
+    runs-on: ubuntu-latest
+    environment: dev2
+    permissions:
+      contents: read
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v6
+      with:
+          fetch-depth: '1'
+    - name: Get short commitId
+      id: get_commit
+      run: |
+        echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+    outputs:
+      SHA_SHORT: ${{steps.get_commit.outputs.SHA_SHORT}}
+  Build:
+    needs: [Setup,Branch]
+    runs-on: ubuntu-latest
+    environment: dev2
+    permissions:
+      contents: read
+    steps:
+    - uses: actions/checkout@v6
+    - name: Resolve build version (from dev) and revision (dev2's own commit)
+      run: |
+        echo "UGM_BUILD_VERSION=$(gh variable get UGM_BUILD_VERSION --env dev)" >> $GITHUB_ENV
+        echo "UGM_BUILD_REVISION=${{needs.Branch.outputs.SHA_SHORT}}" >> $GITHUB_ENV
+    - name: Build Docker images
+      run: |
+        rm -f ./docker-compose.override.yml
+        docker build --build-arg UNITY_BUILD_VERSION=${{env.UGM_BUILD_VERSION}} --build-arg UNITY_BUILD_REVISION=${{env.UGM_BUILD_REVISION}} -t unity-grantmanager-web -f src/Unity.GrantManager.Web/Dockerfile .
+        docker build -t unity-grantmanager-dbmigrator -f src/Unity.GrantManager.DbMigrator/Dockerfile .
+      working-directory: ./applications/Unity.GrantManager
+    - name: Push application images to Artifactory container registry
+      continue-on-error: true
+      run: |
+        echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
+        docker tag unity-grantmanager-dbmigrator $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
+        docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
+        docker tag unity-grantmanager-web $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
+        docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
+        docker logout $JFROG_SERVICE
+    - name: Install OpenShift CLI
+      run: |
+          curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz
+          tar -xvf oc.tar.gz
+          sudo mv oc /usr/local/bin
+    - name: Verify OpenShift CLI installation
+      run: oc version
+    - name: Push application images into ce395f-dev (no ce395f-tools hop for dev2)
+      run: |
+        oc login --token=$OC_TARGET_TOKEN --server=$OC_CLUSTER
+        oc registry login
+        docker login -u unused -p $(oc whoami -t) $OC_REGISTRY
+        docker tag unity-grantmanager-dbmigrator $OC_REGISTRY/$OC_TARGET_PROJECT/$TARGET_ENV-unity-dbmigrator:latest
+        docker push $OC_REGISTRY/$OC_TARGET_PROJECT/$TARGET_ENV-unity-dbmigrator:latest
+        docker tag unity-grantmanager-web $OC_REGISTRY/$OC_TARGET_PROJECT/$TARGET_ENV-unity-grantmanager:latest
+        docker push $OC_REGISTRY/$OC_TARGET_PROJECT/$TARGET_ENV-unity-grantmanager:latest
+        docker logout $OC_REGISTRY
+    - name: Run dbMigrator Job
+      run: |
+        oc -n $OC_TARGET_PROJECT delete jobs $TARGET_ENV-unity-dbmigrator --ignore-not-found=true
+        oc -n $OC_TARGET_PROJECT process unity-grantmanager-dbmigrator-job \
+          -p APPLICATION_GROUP=$TARGET_ENV-unity-grantmanager \
+          -p DATABASE_SERVICE_NAME=$TARGET_ENV-unity-data-postgres \
+          -p APPLICATION_NAME=$TARGET_ENV-unity-dbmigrator \
+          -p IMAGEPULL_NAMESPACE=$OC_TARGET_PROJECT \
+          -p IMAGESTREAM_NAME=$TARGET_ENV-unity-dbmigrator \
+          -p IMAGESTREAM_TAG=latest | oc -n $OC_TARGET_PROJECT create -f -
+        oc -n $OC_TARGET_PROJECT wait jobs/$TARGET_ENV-unity-dbmigrator --for condition=complete --timeout=300s
+    - name: Roll out grantmanager-web and wait
+      run: |
+        oc -n $OC_TARGET_PROJECT rollout restart deployment/$TARGET_ENV-unity-grantmanager-web
+        oc -n $OC_TARGET_PROJECT rollout status deployment/$TARGET_ENV-unity-grantmanager-web --timeout=180s
diff --git a/.github/workflows/docker-build-main.yml b/.github/workflows/docker-build-main.yml
@@ -24,8 +24,8 @@ env:
   GH_TOKEN: ${{secrets.GH_API_TOKEN}}
   OC_CLUSTER: ${{ vars.OPENSHIFT_CLUSTER }}
   OC_REGISTRY: ${{ vars.OPENSHIFT_REGISTRY }}
-  OC_AUTH_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
-  OC_TARGET_PROJECT: ${{ vars.OPENSHIFT_NAMESPACE }}
+  OC_TOOLS_TOKEN: ${{ secrets.TOOLS_OPENSHIFT_TOKEN }}
+  OC_TOOLS_PROJECT: ${{ vars.TOOLS_OPENSHIFT_NAMESPACE }}
   JFROG_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
   JFROG_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
   JFROG_REPO_PATH: ${{ vars.ARTIFACTORY_REPO }}
@@ -47,7 +47,7 @@ jobs:
       run: |
         echo "Target: $TARGET_ENV"
         echo "BaseRef: $GITHUB_REF_NAME"
-        echo "Environment: $TARGET_ENV OC_TARGET_PROJECT=$OC_TARGET_PROJECT"
+        echo "Environment: $TARGET_ENV OC_TOOLS_PROJECT=$OC_TOOLS_PROJECT"
         echo "Environment: $TARGET_ENV JFROG_REPO_PATH=$JFROG_REPO_PATH"
         echo "..."
         env | sort
@@ -181,36 +181,29 @@ jobs:
         docker build --build-arg UNITY_BUILD_VERSION=${{env.UGM_BUILD_VERSION}} --build-arg UNITY_BUILD_REVISION=${{env.UGM_BUILD_REVISION}} -t unity-grantmanager-web -f src/Unity.GrantManager.Web/Dockerfile .
         docker build -t unity-grantmanager-dbmigrator -f src/Unity.GrantManager.DbMigrator/Dockerfile .
       working-directory: ./applications/Unity.GrantManager
-    - name: Connect to JFrog Artifactory non-interactive login using --password-stdin
-      run: |
-        echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
     - name: Push application images to Artifactory container registry
+      continue-on-error: true
       run: |
+        echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
         docker tag unity-grantmanager-dbmigrator $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:stable
         docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:stable
         docker tag unity-grantmanager-web $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:stable
         docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:stable
-    - name: Disconnect docker from JFrog Artifactory
-      run: |
-        docker logout
+        docker logout $JFROG_SERVICE
     - name: Install OpenShift CLI
       run: |
           curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz
           tar -xvf oc.tar.gz
           sudo mv oc /usr/local/bin
     - name: Verify OpenShift CLI installation
       run: oc version
-    - name: Connect to OpenShift API non-interactive login using current session token
+    - name: Push application images into ce395f-tools
       run: |
-        oc login --token=$OC_AUTH_TOKEN --server=$OC_CLUSTER
+        oc login --token=$OC_TOOLS_TOKEN --server=$OC_CLUSTER
         oc registry login
         docker login -u unused -p $(oc whoami -t) $OC_REGISTRY
-    - name: Push application images to OpenShift container registry
-      run: |
-        docker tag unity-grantmanager-dbmigrator $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-dbmigrator:stable
-        docker push $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-dbmigrator:stable
-        docker tag unity-grantmanager-web $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-web:stable
-        docker push $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-web:stable
-    - name: Disconnect docker from OpenShift container registry
-      run: |
-        docker logout
+        docker tag unity-grantmanager-dbmigrator $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:stable
+        docker push $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:stable
+        docker tag unity-grantmanager-web $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:stable
+        docker push $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:stable
+        docker logout $OC_REGISTRY
diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
@@ -24,7 +24,9 @@ env:
   GH_TOKEN: ${{secrets.GH_API_TOKEN}}
   OC_CLUSTER: ${{ vars.OPENSHIFT_CLUSTER }}
   OC_REGISTRY: ${{ vars.OPENSHIFT_REGISTRY }}
-  OC_AUTH_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
+  OC_TOOLS_TOKEN: ${{ secrets.TOOLS_OPENSHIFT_TOKEN }}
+  OC_TOOLS_PROJECT: ${{ vars.TOOLS_OPENSHIFT_NAMESPACE }}
+  OC_TARGET_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
   OC_TARGET_PROJECT: ${{ vars.OPENSHIFT_NAMESPACE }}
   JFROG_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
   JFROG_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
@@ -47,7 +49,7 @@ jobs:
       run: |
         echo "Target: $TARGET_ENV"
         echo "BaseRef: $GITHUB_REF_NAME"
-        echo "Environment: $TARGET_ENV OC_TARGET_PROJECT=$OC_TARGET_PROJECT"
+        echo "Environment: $TARGET_ENV OC_TOOLS_PROJECT=$OC_TOOLS_PROJECT OC_TARGET_PROJECT=$OC_TARGET_PROJECT"
         echo "Environment: $TARGET_ENV JFROG_REPO_PATH=$JFROG_REPO_PATH"
         echo "..."
         env | sort
@@ -160,36 +162,46 @@ jobs:
         docker build --build-arg UNITY_BUILD_VERSION=${{env.UGM_BUILD_VERSION}} --build-arg UNITY_BUILD_REVISION=${{env.UGM_BUILD_REVISION}} -t unity-grantmanager-web -f src/Unity.GrantManager.Web/Dockerfile .
         docker build -t unity-grantmanager-dbmigrator -f src/Unity.GrantManager.DbMigrator/Dockerfile .
       working-directory: ./applications/Unity.GrantManager
-    - name: Connect to JFrog Artifactory non-interactive login using --password-stdin
-      run: |
-        echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
     - name: Push application images to Artifactory container registry
+      continue-on-error: true
       run: |
+        echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
         docker tag unity-grantmanager-dbmigrator $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
         docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
         docker tag unity-grantmanager-web $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
         docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
-    - name: Disconnect docker from JFrog Artifactory
-      run: |
-        docker logout
+        docker logout $JFROG_SERVICE
     - name: Install OpenShift CLI
       run: |
           curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz
           tar -xvf oc.tar.gz
           sudo mv oc /usr/local/bin
     - name: Verify OpenShift CLI installation
       run: oc version
-    - name: Connect to OpenShift API non-interactive login using current session token
+    - name: Push application images into ce395f-tools
       run: |
-        oc login --token=$OC_AUTH_TOKEN --server=$OC_CLUSTER
+        oc login --token=$OC_TOOLS_TOKEN --server=$OC_CLUSTER
         oc registry login
         docker login -u unused -p $(oc whoami -t) $OC_REGISTRY
-    - name: Push application images to OpenShift container registry
+        docker tag unity-grantmanager-dbmigrator $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:latest
+        docker push $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:latest
+        docker tag unity-grantmanager-web $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:latest
+        docker push $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:latest
+        docker logout $OC_REGISTRY
+    - name: Promote dbMigrator into ce395f-test and run migrations
       run: |
-        docker tag unity-grantmanager-dbmigrator $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-dbmigrator
-        docker push $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-dbmigrator
-        docker tag unity-grantmanager-web $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-web
-        docker push $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-web
-    - name: Disconnect docker from OpenShift container registry
+        oc login --token=$OC_TARGET_TOKEN --server=$OC_CLUSTER
+        oc tag $OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:latest $OC_TARGET_PROJECT/$TARGET_ENV-unity-dbmigrator:latest
+        oc -n $OC_TARGET_PROJECT delete jobs $TARGET_ENV-unity-dbmigrator --ignore-not-found=true
+        oc -n $OC_TARGET_PROJECT process unity-grantmanager-dbmigrator-job \
+          -p APPLICATION_GROUP=$TARGET_ENV-unity-grantmanager \
+          -p DATABASE_SERVICE_NAME=$TARGET_ENV-unity-data-postgres \
+          -p APPLICATION_NAME=$TARGET_ENV-unity-dbmigrator \
+          -p IMAGEPULL_NAMESPACE=$OC_TARGET_PROJECT \
+          -p IMAGESTREAM_NAME=$TARGET_ENV-unity-dbmigrator \
+          -p IMAGESTREAM_TAG=latest | oc -n $OC_TARGET_PROJECT create -f -
+        oc -n $OC_TARGET_PROJECT wait jobs/$TARGET_ENV-unity-dbmigrator --for condition=complete --timeout=300s
+    - name: Promote grantmanager-web into ce395f-test and wait
       run: |
-        docker logout
+        oc tag $OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:latest $OC_TARGET_PROJECT/$TARGET_ENV-unity-grantmanager:latest
+        oc -n $OC_TARGET_PROJECT rollout status deployment/$TARGET_ENV-unity-grantmanager-web --timeout=180s
diff --git a/applications/Unity.AutoUI/cypress/e2e/lists.cy.ts b/applications/Unity.AutoUI/cypress/e2e/lists.cy.ts
@@ -92,7 +92,7 @@ describe('Grant Manager Login and List Navigation', () => {
         cy.get('#applicationStatusChart text', { timeout: 30000 })
             .first()
             .should(($el) => {
-                expect(parseInt($el.text(), 10)).to.be.gt(0)
+                expect(Number.parseInt($el.text(), 10)).to.be.gt(0)
             })
 
         cy.visit(Cypress.env('webapp.url'))