wip

Author: drew

.github/workflows/branch-e2e.yml

@@ -29,5 +29,5 @@ jobs:
     needs: [build-gateway, build-cluster]
     uses: ./.github/workflows/e2e-test.yml
     with:
-      image-tag: ${{ github.sha }}
+      image_tag: ${{ github.sha }}
       runner: build-arm64

.github/workflows/docker-build.yml

@@ -32,6 +32,16 @@ on:
         required: false
         type: string
         default: ""
+      checkout_ref:
+        description: "Git ref to check out before building"
+        required: false
+        type: string
+        default: ""
+      image_tag:
+        description: "Image tag to publish"
+        required: false
+        type: string
+        default: ""
 
 env:
   MISE_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -55,13 +65,14 @@ jobs:
       volumes:
         - /var/run/docker.sock:/var/run/docker.sock
     env:
-      IMAGE_TAG: ${{ github.sha }}
+      IMAGE_TAG: ${{ inputs.image_tag != '' && inputs.image_tag || github.sha }}
       IMAGE_REGISTRY: ghcr.io/nvidia/openshell
       DOCKER_PUSH: ${{ inputs.push && '1' || '0' }}
       DOCKER_PLATFORM: ${{ inputs.platform }}
     steps:
       - uses: actions/checkout@v4
         with:
+          ref: ${{ inputs.checkout_ref != '' && inputs.checkout_ref || github.ref }}
           fetch-depth: 0
 
       - name: Mark workspace safe for git

.github/workflows/e2e-test.yml

@@ -3,7 +3,7 @@ name: E2E Test
 on:
   workflow_call:
     inputs:
-      image-tag:
+      image_tag:
         description: "Image tag to test (typically the commit SHA)"
         required: true
         type: string
@@ -12,6 +12,11 @@ on:
         required: false
         type: string
         default: "build-amd64"
+      checkout_ref:
+        description: "Git ref to check out for the test run"
+        required: false
+        type: string
+        default: ""
 
 permissions:
   contents: read
@@ -48,7 +53,7 @@ jobs:
         - /var/run/docker.sock:/var/run/docker.sock
     env:
       MISE_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      IMAGE_TAG: ${{ inputs.image-tag }}
+      IMAGE_TAG: ${{ inputs.image_tag }}
       OPENSHELL_REGISTRY: ghcr.io/nvidia/openshell
       OPENSHELL_REGISTRY_HOST: ghcr.io
       OPENSHELL_REGISTRY_NAMESPACE: nvidia/openshell
@@ -57,12 +62,14 @@ jobs:
       OPENSHELL_GATEWAY: ${{ matrix.cluster }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.checkout_ref != '' && inputs.checkout_ref || github.ref }}
 
       - name: Log in to GHCR
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u "${{ github.actor }}" --password-stdin
 
       - name: Pull cluster image
-        run: docker pull ghcr.io/nvidia/openshell/cluster:${{ inputs.image-tag }}
+        run: docker pull ghcr.io/nvidia/openshell/cluster:${{ inputs.image_tag }}
 
       - name: Install Python dependencies and generate protobuf stubs
         if: matrix.suite == 'python'
@@ -83,7 +90,7 @@ jobs:
           CLUSTER_NAME: ${{ matrix.cluster }}
           SKIP_IMAGE_PUSH: "1"
           SKIP_CLUSTER_IMAGE_BUILD: "1"
-          OPENSHELL_CLUSTER_IMAGE: ghcr.io/nvidia/openshell/cluster:${{ inputs.image-tag }}
+          OPENSHELL_CLUSTER_IMAGE: ghcr.io/nvidia/openshell/cluster:${{ inputs.image_tag }}
         run: mise run --no-prepare --skip-deps cluster
 
       - name: Run tests