Add generic dispatchers

Signed-off-by: Ben <[email protected]>

Author: Neon-White

.github/workflows/ibm-nightly-cleanup-dispatcher.yaml

@@ -0,0 +1,14 @@
+name: Nightly IBM VM Cleanup Dispatcher
+
+on:
+    schedule:
+        # Run daily at 4 AM UTC (4 hours after the nightly provisioning at midnight)
+        - cron: '0 4 * * *'
+    workflow_dispatch: # Allow manual triggering for on-demand cleanup
+
+jobs:
+  cleanup-warp-vm:
+    uses: ./.github/workflows/ibm-nightly-vm-cleanup.yaml
+    secrets:
+      VM_CONFIG: ${{ secrets.IBM_WARP_VM_CONFIG }}
+      IBM_CLOUD_API_KEY: ${{ secrets.IBM_CLOUD_API_KEY }}

.github/workflows/ibm-nightly-provision-dispatcher.yaml

@@ -0,0 +1,18 @@
+name: Nightly IBM VM Provision Dispatcher
+
+on:
+    schedule:
+        # Run daily at midnight UTC
+        - cron: '0 0 * * *'
+    workflow_dispatch: # Allow manual triggering for on-demand provisioning
+
+jobs:
+  provision-warp-vm:
+    uses: ./.github/workflows/ibm-nightly-vm-provision.yaml
+    with:
+        VM_CLOUD_INIT_CONFIG_LOCATION: ".github/ibm-warp-runner-config.yaml"
+    secrets:
+      VM_CONFIG: ${{ secrets.IBM_WARP_VM_CONFIG }}
+      IBM_CLOUD_API_KEY: ${{ secrets.IBM_CLOUD_API_KEY }}
+      IBM_COS_WRITER_CREDENTIALS: ${{ secrets.IBM_COS_WRITER_CREDENTIALS }}
+      SLACK_NIGHTLY_RESULTS_URL: ${{ secrets.SLACK_NIGHTLY_RESULTS_URL }}

.github/workflows/ibm-nightly-vm-cleanup.yaml

@@ -1,9 +1,12 @@
 name: Nightly IBM VM Cleanup
 
 on:
-  schedule:
-    # Run daily at 4 AM UTC (4 hours after the nightly provisioning at midnight)
-    - cron: '0 4 * * *'
+  workflow_call:
+    secrets:
+      VM_CONFIG:
+        required: true
+      IBM_CLOUD_API_KEY:
+        required: true
   workflow_dispatch: # Allow manual triggering for on-demand cleanup
 
 permissions:
@@ -27,12 +30,12 @@ jobs:
 
       - name: Mask and export VM config from JSON secret
         env:
-          IBM_WARP_VM_CONFIG: ${{ secrets.IBM_WARP_VM_CONFIG }}
+          VM_CONFIG: ${{ secrets.VM_CONFIG }}
         run: |
           # Mask non-empty values
-          jq -r 'to_entries[] | select(.value != "") | "::add-mask::\(.value)"' <<<"${IBM_WARP_VM_CONFIG}"
+          jq -r 'to_entries[] | select(.value != "") | "::add-mask::\(.value)"' <<<"${VM_CONFIG}"
           # Append KEY=VALUE lines to GITHUB_ENV
-          jq -r 'to_entries[] | "\(.key)=\(.value)"' <<<"${IBM_WARP_VM_CONFIG}" >>"$GITHUB_ENV"
+          jq -r 'to_entries[] | "\(.key)=\(.value)"' <<<"${VM_CONFIG}" >>"$GITHUB_ENV"
 
 
       - name: Authenticate with IBM Cloud

.github/workflows/ibm-nightly-vm-provision.yaml

@@ -1,8 +1,20 @@
 name: Nightly IBM VM Provisioning
 
 on:
-  schedule:
-    - cron: '0 0 * * *' # Midnight UTC
+  workflow_call:
+    inputs:
+      VM_CLOUD_INIT_CONFIG_LOCATION:
+        required: true
+        type: string
+    secrets:
+      VM_CONFIG:
+        required: true
+      IBM_CLOUD_API_KEY:
+        required: true
+      IBM_COS_WRITER_CREDENTIALS:
+        required: true
+      SLACK_NIGHTLY_RESULTS_URL:
+        required: true
   workflow_dispatch:
 
 permissions:
@@ -29,12 +41,12 @@ jobs:
 
       - name: Mask and export VM config from JSON secret
         env:
-          IBM_WARP_VM_CONFIG: ${{ secrets.IBM_WARP_VM_CONFIG }}
+          VM_CONFIG: ${{ secrets.VM_CONFIG }}
         run: |
           # Mask non-empty values
-          jq -r 'to_entries[] | select(.value != "") | "::add-mask::\(.value)"' <<<"${IBM_WARP_VM_CONFIG}"
+          jq -r 'to_entries[] | select(.value != "") | "::add-mask::\(.value)"' <<<"${VM_CONFIG}"
           # Append KEY=VALUE lines to GITHUB_ENV
-          jq -r 'to_entries[] | "\(.key)=\(.value)"' <<<"${IBM_WARP_VM_CONFIG}" >>"$GITHUB_ENV"
+          jq -r 'to_entries[] | "\(.key)=\(.value)"' <<<"${VM_CONFIG}" >>"$GITHUB_ENV"
 
 
       - name: Authenticate with IBM Cloud
@@ -57,14 +69,15 @@ jobs:
       - name: Create user-data with secrets
         env:
           SLACK_NIGHTLY_RESULTS_URL: ${{ secrets.SLACK_NIGHTLY_RESULTS_URL }}
+          VM_CLOUD_INIT_CONFIG_LOCATION: ${{ inputs.VM_CLOUD_INIT_CONFIG_LOCATION }}
         run: |
           # Mask sensitive values
           [ -n "${SLACK_NIGHTLY_RESULTS_URL:-}" ] && echo "::add-mask::$SLACK_NIGHTLY_RESULTS_URL"
           export SLACK_NIGHTLY_RESULTS_URL
           export AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY WARP_LOGS_BUCKET IBM_COS_ENDPOINT
           
           # Use envsubst to replace variables in the config
-          envsubst < .github/ibm-warp-runner-config.yaml > /tmp/ibm-warp-runner-config-with-secrets.yaml
+          envsubst < ${VM_CLOUD_INIT_CONFIG_LOCATION} > /tmp/ibm-vm-runner-config-with-secrets.yaml
 
       - name: Provision IBM VM
         run: |
@@ -80,7 +93,7 @@ jobs:
             "${SUBNET_ID}" \
             --image "${IMAGE_ID}" \
             --sgs "${SECURITY_GROUP_ID}" \
-            --user-data @/tmp/ibm-warp-runner-config-with-secrets.yaml \
+            --user-data @/tmp/ibm-vm-runner-config-with-secrets.yaml \
             > /dev/null 2>&1
           then
             echo "❌ Failed to provision IBM VM"
@@ -125,6 +138,6 @@ jobs:
         if: always()
         run: |
           # Remove temporary user-data file
-          rm -f /tmp/ibm-warp-runner-config-with-secrets.yaml
+          rm -f /tmp/ibm-vm-runner-config-with-secrets.yaml
           # Logout from IBM Cloud
           ibmcloud logout > /dev/null 2>&1 || true