refactor: centralize CI variables and add component image overrides

Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>

Author: ArangoGutierrez

.github/workflows/e2e-tests.yaml

@@ -76,58 +76,13 @@ on:
 
 jobs:
   variables:
-    runs-on: ubuntu-latest
-    outputs:
-      operator_version: ${{ steps.vars.outputs.operator_version }}
-      operator_image: ${{ steps.vars.outputs.operator_image }}
-      toolkit_image: ${{ steps.vars.outputs.toolkit_image }}
-      device_plugin_image: ${{ steps.vars.outputs.device_plugin_image }}
-      mig_manager_image: ${{ steps.vars.outputs.mig_manager_image }}
-    steps:
-      - name: Checkout code
-        if: ${{ github.event_name != 'workflow_call' }}
-        uses: actions/checkout@v5
-      - name: Calculate test variables
-        id: vars
-        run: |
-          # Use inputs from workflow_call if available
-          if [[ "${{ github.event_name }}" == "workflow_call" ]]; then
-            OPERATOR_IMAGE="${{ inputs.operator_image }}"
-            OPERATOR_VERSION="${{ inputs.operator_version }}"
-          # Use workflow_dispatch inputs if provided
-          elif [[ -n "${{ inputs.operator_version }}" && -n "${{ inputs.operator_image }}" ]]; then
-            OPERATOR_VERSION="${{ inputs.operator_version }}"
-            OPERATOR_IMAGE="${{ inputs.operator_image }}"
-          else
-            # Calculate for standalone runs
-            COMMIT_SHORT_SHA="${GITHUB_SHA:0:8}"
-            OPERATOR_VERSION="${COMMIT_SHORT_SHA}"
-            OPERATOR_IMAGE="ghcr.io/nvidia/gpu-operator"
-          fi
-          
-          # Component images (optional, use inputs if provided)
-          TOOLKIT_IMAGE="${{ inputs.toolkit_image }}"
-          DEVICE_PLUGIN_IMAGE="${{ inputs.device_plugin_image }}"
-          MIG_MANAGER_IMAGE="${{ inputs.mig_manager_image }}"
-          
-          # Output all variables
-          echo "operator_version=${OPERATOR_VERSION}" >> $GITHUB_OUTPUT
-          echo "operator_image=${OPERATOR_IMAGE}" >> $GITHUB_OUTPUT
-          echo "toolkit_image=${TOOLKIT_IMAGE}" >> $GITHUB_OUTPUT
-          echo "device_plugin_image=${DEVICE_PLUGIN_IMAGE}" >> $GITHUB_OUTPUT
-          echo "mig_manager_image=${MIG_MANAGER_IMAGE}" >> $GITHUB_OUTPUT
-          
-          # Display for debugging
-          echo "::notice::Testing operator: ${OPERATOR_IMAGE}:${OPERATOR_VERSION}"
-          if [[ -n "${TOOLKIT_IMAGE}" ]]; then
-            echo "::notice::Using custom toolkit: ${TOOLKIT_IMAGE}"
-          fi
-          if [[ -n "${DEVICE_PLUGIN_IMAGE}" ]]; then
-            echo "::notice::Using custom device-plugin: ${DEVICE_PLUGIN_IMAGE}"
-          fi
-          if [[ -n "${MIG_MANAGER_IMAGE}" ]]; then
-            echo "::notice::Using custom mig-manager: ${MIG_MANAGER_IMAGE}"
-          fi
+    uses: ./.github/workflows/variables.yaml
+    with:
+      operator_image: ${{ inputs.operator_image }}
+      operator_version: ${{ inputs.operator_version }}
+      toolkit_image: ${{ inputs.toolkit_image }}
+      device_plugin_image: ${{ inputs.device_plugin_image }}
+      mig_manager_image: ${{ inputs.mig_manager_image }}
 
   e2e-tests-containerd:
     needs: [variables]
@@ -226,4 +181,3 @@ jobs:
           name: nvidiadriver-e2e-test-logs
           path: ./logs/
           retention-days: 15
-

.github/workflows/variables.yaml

@@ -14,6 +14,27 @@
 
 on:
   workflow_call:
+    inputs:
+      operator_image:
+        description: 'Operator image to use (optional override)'
+        required: false
+        type: string
+      operator_version:
+        description: 'Operator version to use (optional override)'
+        required: false
+        type: string
+      toolkit_image:
+        description: 'Full container-toolkit image path (optional)'
+        required: false
+        type: string
+      device_plugin_image:
+        description: 'Full device-plugin image path (optional)'
+        required: false
+        type: string
+      mig_manager_image:
+        description: 'Full mig-manager image path (optional)'
+        required: false
+        type: string
     outputs:
       commit_short_sha:
         description: "The short SHA to use as a version string"
@@ -33,6 +54,18 @@ on:
       operator_version:
         description: "The operator version"
         value: ${{ jobs.variables.outputs.operator_version }}
+      operator_image:
+        description: "The operator image (with override support)"
+        value: ${{ jobs.variables.outputs.operator_image }}
+      toolkit_image:
+        description: "The container-toolkit image override"
+        value: ${{ jobs.variables.outputs.toolkit_image }}
+      device_plugin_image:
+        description: "The device-plugin image override"
+        value: ${{ jobs.variables.outputs.device_plugin_image }}
+      mig_manager_image:
+        description: "The mig-manager image override"
+        value: ${{ jobs.variables.outputs.mig_manager_image }}
 
 jobs:
   variables:
@@ -44,6 +77,10 @@ jobs:
       push_on_build: ${{ steps.vars.outputs.push_on_build }}
       operator_image_base: ${{ steps.vars.outputs.operator_image_base }}
       operator_version: ${{ steps.vars.outputs.operator_version }}
+      operator_image: ${{ steps.vars.outputs.operator_image }}
+      toolkit_image: ${{ steps.vars.outputs.toolkit_image }}
+      device_plugin_image: ${{ steps.vars.outputs.device_plugin_image }}
+      mig_manager_image: ${{ steps.vars.outputs.mig_manager_image }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
@@ -73,9 +110,24 @@ jobs:
             fi
           fi
           
-          # Image and version information
+          # Image and version information (with override support)
           OPERATOR_IMAGE_BASE="ghcr.io/nvidia/gpu-operator"
-          OPERATOR_VERSION="${COMMIT_SHORT_SHA}"
+          if [[ -n "${{ inputs.operator_version }}" ]]; then
+            OPERATOR_VERSION="${{ inputs.operator_version }}"
+          else
+            OPERATOR_VERSION="${COMMIT_SHORT_SHA}"
+          fi
+          
+          if [[ -n "${{ inputs.operator_image }}" ]]; then
+            OPERATOR_IMAGE="${{ inputs.operator_image }}"
+          else
+            OPERATOR_IMAGE="${OPERATOR_IMAGE_BASE}"
+          fi
+          
+          # Component images (optional overrides)
+          TOOLKIT_IMAGE="${{ inputs.toolkit_image }}"
+          DEVICE_PLUGIN_IMAGE="${{ inputs.device_plugin_image }}"
+          MIG_MANAGER_IMAGE="${{ inputs.mig_manager_image }}"
           
           # Output all variables
           echo "commit_short_sha=${COMMIT_SHORT_SHA}" >> $GITHUB_OUTPUT
@@ -84,9 +136,22 @@ jobs:
           echo "push_on_build=${PUSH_ON_BUILD}" >> $GITHUB_OUTPUT
           echo "operator_image_base=${OPERATOR_IMAGE_BASE}" >> $GITHUB_OUTPUT
           echo "operator_version=${OPERATOR_VERSION}" >> $GITHUB_OUTPUT
+          echo "operator_image=${OPERATOR_IMAGE}" >> $GITHUB_OUTPUT
+          echo "toolkit_image=${TOOLKIT_IMAGE}" >> $GITHUB_OUTPUT
+          echo "device_plugin_image=${DEVICE_PLUGIN_IMAGE}" >> $GITHUB_OUTPUT
+          echo "mig_manager_image=${MIG_MANAGER_IMAGE}" >> $GITHUB_OUTPUT
           
           # Display for debugging
           echo "::notice::Commit SHA: ${COMMIT_SHORT_SHA}"
           echo "::notice::Push on build: ${PUSH_ON_BUILD}"
-          echo "::notice::Operator image: ${OPERATOR_IMAGE_BASE}:${OPERATOR_VERSION}"
+          echo "::notice::Operator image: ${OPERATOR_IMAGE}:${OPERATOR_VERSION}"
+          if [[ -n "${TOOLKIT_IMAGE}" ]]; then
+            echo "::notice::Using custom toolkit: ${TOOLKIT_IMAGE}"
+          fi
+          if [[ -n "${DEVICE_PLUGIN_IMAGE}" ]]; then
+            echo "::notice::Using custom device-plugin: ${DEVICE_PLUGIN_IMAGE}"
+          fi
+          if [[ -n "${MIG_MANAGER_IMAGE}" ]]; then
+            echo "::notice::Using custom mig-manager: ${MIG_MANAGER_IMAGE}"
+          fi