chore(ci): cronjob image and simplify deploy trigger (#735)

.github/workflows/pr-open.yml

@@ -87,21 +87,17 @@ jobs:
               -p DB_TESTDATA=true
               -p AWS_USER_POOLS_WEB_CLIENT_ID="7hpo4qa7j0hs0rkfl2pm0sto5k"
               -p LOGOUT_CHAIN_URL="https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi?retnow=1&returl=https://dev.loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/logout?redirect_uri="
-            triggers: ('db/' 'libs/' 'api/')
           - name: admin
             file: admin/openshift.deploy.yml
             overwrite: true
             parameters: -p REPLICA_COUNT=1
-            triggers: ('db/' 'libs/' 'api/' 'admin/')
           - name: db
             file: db/openshift.deploy.yml
             overwrite: false
-            triggers: ('db/' 'libs/' 'api/' 'admin/' 'public/')
           - name: public
             file: public/openshift.deploy.yml
             overwrite: true
             parameters: -p REPLICA_COUNT=1
-            triggers: ('db/' 'libs/' 'api/' 'public/')
     steps:
       - uses: bcgov-nr/[email protected]
         with:
@@ -115,4 +111,4 @@ jobs:
             -p URL=fom-${{ needs.init.outputs.route_number }}.apps.silver.devops.gov.bc.ca
             -p ZONE=${{ github.event.number }} -p TAG=${{ github.event.number }}
             ${{ matrix.parameters }}
-          triggers: ${{ matrix.triggers }}
+          triggers: ('db/' 'libs/' 'api/' 'admin/' 'public/')

db/openshift.deploy.yml

@@ -22,6 +22,9 @@ parameters:
   - name: TAG
     description: Image tag; e.g. PR number, latest or prod
     required: true
+  - name: CRONJOB_RESTORE_TAG
+    description: Image tag for database restore cronjob; e.g. PR number, latest or prod
+    value: prod
   - description: Volume space available for data, e.g. 512Mi, 2Gi.
     displayName: Database Volume Capacity
     name: DB_PVC_SIZE
@@ -339,7 +342,7 @@ objects:
               containers:
                 - name: ${NAME}-${ZONE}-${COMPONENT}-restore
                   # use the same image as our database, so we can run the psql command
-                  image: ${REGISTRY}/${ORG}/nr-fom/${COMPONENT}:${ZONE}
+                  image: ${REGISTRY}/${ORG}/nr-fom/${COMPONENT}:${CRONJOB_RESTORE_TAG}
                   command: ["/bin/sh", "-c"]
                   args:
                   - |
@@ -384,7 +387,7 @@ objects:
                           echo "psql successfully reverted current failed db restore procedure. DB fom is back to original state. However, the restore procedure failed."
                           exit $db_restore_cmd_status
                         else
-                          echo "Error: psql failed to attmpt reverting failed db restore procedure. Please manually rename ${OLD_FOM_DATABASE_NAME} back to fom."
+                          echo "Error: psql failed to attempt reverting failed db restore procedure. Please manually rename ${OLD_FOM_DATABASE_NAME} back to fom."
                           exit $db_revert_restore_cmd_status
                         fi
                       else