test(upgrade): use runtime image environment overrides

Signed-off-by: Evan Lezar <elezar@nvidia.com>

Author: elezar

.github/workflows/branch-e2e.yml

@@ -220,18 +220,6 @@ jobs:
       packages: write
     uses: ./.github/workflows/build-images.yml
 
-  build-deb:
-    name: Build Debian packages
-    needs: [pr_metadata, version, build-binaries, build-vm-driver]
-    if: needs.pr_metadata.outputs.run_integration == 'true'
-    permissions:
-      contents: read
-      packages: read
-    uses: ./.github/workflows/deb-package.yml
-    with:
-      checkout-ref: ${{ github.sha }}
-      deb-version: ${{ needs.version.outputs.deb_version }}
-
   build-rpm:
     name: Build RPM packages
     needs: [pr_metadata, version, build-binaries]

crates/openshell-server/src/storage_proto.rs

@@ -136,9 +136,9 @@ mod tests {
     // decoding or deadline updates cannot claim an existing attempt.
     // NetworkEndpoint retains pre.4 string fields and uses new tags for enums.
     const PUBLIC_RPC_SCHEMA_SHA256: &str =
-        "18206c52e68fdb0af60f8bb8dfaf47d9bc8021222cb49cacffab6352d3ad5549";
+        "75dc8ba3eea1457d0ffed3a2eee1a0ea471e3cb5743b819d7707592805ebf01a";
     const DURABLE_SCHEMA_SHA256: &str =
-        "76487ab369fc3a4b03a179bb5e7ea6be8d20e380ad5563075dff8ee50e539406";
+        "56baed61dd3b61272e648d60fcb6b37f4a71c6c6b192f1e3cb086f28df420bf1";
     const PUBLIC_DURABLE_OVERLAP_SHA256: &str =
         "761dea31a521b0650840fe2a823ad6e36a265ed323ba4506889781d630df0ee3";
     // A persisted Sandbox without endpoint status retains its lifecycle fields;

tests/ansible/playbooks/openshell-deb-upgrade-source.yaml

@@ -4,6 +4,8 @@
 ---
 - name: Install prerelease OpenShell Debian upgrade source
   ansible.builtin.import_playbook: openshell-deb.yaml
+  vars:
+    openshell_packaged_gateway_legacy_images: true
 
 - name: Record OpenShell Debian upgrade source
   hosts: all

tests/ansible/playbooks/openshell-rpm-upgrade-source.yaml

@@ -4,6 +4,8 @@
 ---
 - name: Install prerelease OpenShell RPM upgrade source
   ansible.builtin.import_playbook: openshell-rpm.yaml
+  vars:
+    openshell_packaged_gateway_legacy_images: true
 
 - name: Record OpenShell RPM upgrade source
   hosts: all

tests/ansible/playbooks/upgrade/deb.yaml

@@ -99,6 +99,15 @@
             deb: /var/tmp/openshell-upgrade-target.deb
             allow_downgrade: true
 
+        - name: Select candidate runtime images through the package environment
+          ansible.builtin.copy:
+            dest: /home/tmachine/.config/openshell/gateway.env
+            mode: "0600"
+            content: |
+              OPENSHELL_COMPUTE_DRIVER=docker
+              OPENSHELL_SANDBOX_RUNTIME_IMAGE=docker.io/openshell/sandbox:tmachine
+              OPENSHELL_SUPERVISOR_IMAGE=docker.io/openshell/supervisor:tmachine
+
         - name: Restart packaged OpenShell gateway service
           ansible.builtin.systemd_service:
             name: openshell-gateway.service
@@ -178,7 +187,7 @@
               sudo docker logs "${container}" 2>&1
             done
             sudo docker images
-            sudo cat /var/lib/openshell-qualification/gateway.toml
+            cat /home/tmachine/.config/openshell/gateway.env
           args:
             executable: /bin/bash
           environment: "{{ user_systemd_environment }}"

tests/ansible/playbooks/upgrade/rpm.yaml

@@ -135,6 +135,15 @@
             disable_gpg_check: true
             allow_downgrade: true
 
+        - name: Select candidate runtime images through the package environment
+          ansible.builtin.copy:
+            dest: /home/tmachine/.config/openshell/gateway.env
+            mode: "0600"
+            content: |
+              OPENSHELL_COMPUTE_DRIVER=podman
+              OPENSHELL_SANDBOX_RUNTIME_IMAGE=docker.io/openshell/sandbox:tmachine
+              OPENSHELL_SUPERVISOR_IMAGE=docker.io/openshell/supervisor:tmachine
+
         - name: Restart packaged OpenShell gateway service
           ansible.builtin.systemd_service:
             name: openshell-gateway.service
@@ -221,7 +230,7 @@
               podman logs "${container}" 2>&1
             done
             podman images
-            sudo cat /var/lib/openshell-qualification/gateway.toml
+            cat /home/tmachine/.config/openshell/gateway.env
           args:
             executable: /bin/bash
           environment: "{{ user_systemd_environment }}"

tests/ansible/roles/openshell_packaged_gateway/tasks/legacy-images.yaml

@@ -0,0 +1,44 @@
+# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+---
+# pre.4 predates runtime-image environment overrides.
+- name: Create legacy upgrade source metadata directory
+  become: true
+  ansible.builtin.file:
+    path: /var/lib/openshell-qualification
+    state: directory
+    owner: root
+    group: root
+    mode: "0755"
+
+- name: Configure legacy upgrade source runtime images
+  become: true
+  ansible.builtin.copy:
+    dest: /var/lib/openshell-qualification/gateway.toml
+    owner: root
+    group: root
+    mode: "0644"
+    content: |
+      [openshell]
+      version = 2
+
+      [openshell.gateway]
+      compute_driver = "{{ openshell_gateway_driver }}"
+
+      [openshell.drivers.{{ openshell_gateway_driver }}]
+      {% if openshell_gateway_driver == 'podman' %}
+      socket_path = "{{ openshell_runtime_socket }}"
+      {% endif %}
+      sandbox_runtime_image = "docker.io/openshell/sandbox:tmachine"
+      supervisor_image = "docker.io/openshell/supervisor:tmachine"
+
+- name: Select legacy upgrade source configuration
+  become: true
+  ansible.builtin.copy:
+    dest: "{{ openshell_gateway_home }}/.config/openshell/gateway.env"
+    owner: "{{ openshell_gateway_user }}"
+    group: "{{ openshell_gateway_user }}"
+    mode: "0600"
+    content: |
+      OPENSHELL_GATEWAY_CONFIG=/var/lib/openshell-qualification/gateway.toml

tests/ansible/roles/openshell_packaged_gateway/tasks/main.yaml

@@ -45,6 +45,10 @@
       OPENSHELL_SANDBOX_RUNTIME_IMAGE=docker.io/openshell/sandbox:tmachine
       OPENSHELL_SUPERVISOR_IMAGE=docker.io/openshell/supervisor:tmachine
 
+- name: Prepare legacy upgrade source image configuration
+  when: openshell_packaged_gateway_legacy_images | default(false) | bool
+  ansible.builtin.include_tasks: legacy-images.yaml
+
 - name: Start gateway user manager
   ansible.builtin.include_role:
     name: tmachine_user_manager