chore(ci): build_number var in sync (#1502)

.github/workflows/.deploy.yml

@@ -189,25 +189,4 @@ jobs:
 
       - name: Run sync ETL
         if: github.event_name == 'pull_request'
-        run: |
-          # Run and verify job
-
-          # Login
-          oc login --token=${{ secrets.oc_token }} --server=${{ vars.oc_server }}
-          oc project ${{ secrets.oc_namespace }} #Safeguard!
-
-          # Exit on errors or unset variables
-          set -eu
-
-          # Create job
-          CRONJOB=nr-spar-${{ inputs.target }}-sync
-          RUN_JOB=${CRONJOB}--$(date +"%Y-%m-%d--%H-%M-%S")
-          oc create job ${RUN_JOB} --from=cronjob/${CRONJOB}
-
-          # Follow
-          oc wait --for=condition=ready pod --selector=job-name=${RUN_JOB} --timeout=1m
-          oc logs -l job-name=${RUN_JOB} --tail=50 --follow
-
-          # Verify successful completion
-          oc wait --for jsonpath='{.status.phase}'=Succeeded pod --selector=job-name=${RUN_JOB} --timeout=1m
-          echo "Job successful!"
+        run: ./sync/oc_run.sh ${{ secrets.oc_token }}

.github/workflows/demo.yml

@@ -30,7 +30,7 @@ jobs:
 
           # Login
           oc login --token=${{ secrets.oc_token }} --server=${{ vars.oc_server }}
-          oc project ${{ secrets.oc_namespace }} #Safeguard!
+          oc project ${{ vars.oc_namespace }} #Safeguard!
 
           # Delete and replace route
           oc delete route/${{ env.REPO }}-${{ env.DEST }} --ignore-not-found=true

.github/workflows/job-sync.yml

@@ -29,7 +29,7 @@ jobs:
 
           # Login
           oc login --token=${{ secrets.oc_token }} --server=${{ vars.oc_server }}
-          oc project ${{ secrets.oc_namespace }} #Safeguard!
+          oc project ${{ vars.oc_namespace }} #Safeguard!
 
           # Exit on errors or unset variables
           set -eu

.github/workflows/pr-open.yml

@@ -24,8 +24,8 @@ jobs:
         id: build
         with:
           build_args: |
-            "BUILDKIT_INLINE_CACHE=1"
-            --build-arg BUILD_NUMBER=${{ github.event.number }}
+            BUILD_NUMBER=${{ github.event.number }}
+            BUILDKIT_INLINE_CACHE=1
           package: ${{ matrix.package }}
           tag: ${{ github.event.number }}
           tag_fallback: latest

sync/Dockerfile

@@ -1,7 +1,7 @@
 FROM python:3.12-slim
 
 # Receive build number as argument, retain as environment variable
-ARG BUILD_NUMBER=0
+ARG BUILD_NUMBER
 ENV BUILD_NUMBER=${BUILD_NUMBER}
 
 # Packages and nonroot user

sync/oc_run.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Exit on errors or unset variables
+set -eux
+
+# Run and verify job
+
+# Login
+if [ ! -z "${1:-}" ]; then
+  oc login --token=${1} --server=https://api.silver.devops.gov.bc.ca:6443
+  oc project  #Safeguard!
+fi
+
+# Create job
+CRONJOB=nr-spar-1502-sync
+RUN_JOB=${CRONJOB}--$(date +"%Y-%m-%d--%H-%M-%S")
+oc create job ${RUN_JOB} --from=cronjob/${CRONJOB}
+
+# Follow
+oc wait --for=condition=ready pod --selector=job-name=${RUN_JOB} --timeout=1m
+oc logs -l job-name=${RUN_JOB} --tail=50 --follow
+
+# Verify successful completion
+oc wait --for jsonpath='{.status.phase}'=Succeeded pod --selector=job-name=${RUN_JOB} --timeout=1m
+echo "Job successful!"

sync/openshift.deploy.yml

@@ -30,10 +30,6 @@ parameters:
     value: "false"
 
   ### Usually a bad idea - not recommended
-  - name: CRON_MINUTES
-    description: Random number, 0-60, for scheduling cronjobs
-    from: "[0-5]{1}[0-9]{1}"
-    generate: expression
   - name: JOB_BACKOFF_LIMIT
     description: "The number of attempts to try for a successful job outcome"
     value: "3"