test(tmachine): run e2e-podman against the packaged gateway

Detect the installer in the e2e-podman playbook: the binaries installer keeps
its HTTP gateway, and the package installers use /usr/bin/openshell and the
registered openshell gateway. Run the lane on rpm in CI.

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

Author: elezar

.github/workflows/branch-e2e.yml

@@ -462,8 +462,7 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
-  # Run the Podman e2e suite on tmachine. It needs the binary installer's CLI
-  # path and local HTTP gateway.
+  # Run the Podman e2e suite on tmachine against the packaged gateway.
   podman-e2e-integration:
     needs: prepare-integration
     permissions:
@@ -477,7 +476,7 @@ jobs:
       integration-inputs-artifact-id: ${{ needs.prepare-integration.outputs.integration_inputs_artifact_id }}
       test-matrix: >-
         [
-          {"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"e2e-podman"}
+          {"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"e2e-podman"}
         ]
 
   docker-e2e:

.github/workflows/integration-runner.yml

@@ -24,7 +24,7 @@ on:
         type: string
         default: >-
           [
-            {"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"e2e-podman"}
+            {"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"e2e-podman"}
           ]
 
 permissions:

.github/workflows/integration-test.yml

@@ -27,7 +27,7 @@ on:
         type: string
         default: >-
           [
-            {"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"e2e-podman"}
+            {"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"e2e-podman"}
           ]
 
 permissions:

CI.md

@@ -169,9 +169,8 @@ images. Release Dev, Release, and Pre-release use the same package installers.
 The feature suites (`tests/suites/features`) and the Podman driver suite
 (`tests/suites/drivers/podman`) run the same way, on the package installers; the
 driver suite's environments merge their Podman settings into the packaged
-gateway's configuration (see `TESTING.md`). The `e2e-podman` lane retains the
-binary installer because its playbook assumes that installer's system service,
-local HTTP gateway, and CLI path. The driver suite and `e2e-podman` run
+gateway's configuration (see `TESTING.md`). The `e2e-podman` lane runs on the
+RPM installer as well. The driver suite and `e2e-podman` run
 only in `Branch E2E Checks`. The manual Integration Tests workflow runs the
 remaining tmachine testsuites, such as `e2e-podman`, and downloads the packages
 selected by its matrix.

TESTING.md

@@ -541,7 +541,7 @@ Run the portable subset in a disposable rootless Podman guest:
 
 ```shell
 nix run .#build-artifacts
-nix run .#tmachine -- test fedora-podman-rootless binaries e2e-podman
+nix run .#tmachine -- test fedora-podman-rootless rpm e2e-podman
 ```
 
 Print the exact tmachine archive selection as a shell `PODMAN_CI_TESTS` array:

tests/tmachine/ansible/playbooks/drivers/podman/e2e.yaml

@@ -48,13 +48,30 @@
         HOME: /home/tmachine
         XDG_RUNTIME_DIR: /run/user/1000
 
+    # The binaries installer runs a plain-HTTP gateway named tmachine from a
+    # system service and puts the CLI in /usr/local/bin. The package installers
+    # run the packaged user service, install the CLI in /usr/bin and register
+    # the gateway as openshell, using the package default network and namespace.
+    - name: Detect the installer
+      ansible.builtin.stat:
+        path: /usr/local/bin/openshell
+      register: podman_e2e_binaries_cli
+
+    - name: Select the gateway under test
+      ansible.builtin.set_fact:
+        podman_e2e_binaries: "{{ podman_e2e_binaries_cli.stat.exists }}"
+        podman_e2e_cli: "{{ '/usr/local/bin/openshell' if podman_e2e_binaries_cli.stat.exists else '/usr/bin/openshell' }}"
+        podman_e2e_gateway: "{{ 'tmachine' if podman_e2e_binaries_cli.stat.exists else 'openshell' }}"
+
     - name: Remove any previous OpenShell gateway registration
+      when: podman_e2e_binaries
       ansible.builtin.command:
         argv: [/usr/local/bin/openshell, gateway, remove, tmachine]
       changed_when: false
       failed_when: false
 
     - name: Register the configured OpenShell gateway
+      when: podman_e2e_binaries
       ansible.builtin.command:
         argv: [/usr/local/bin/openshell, gateway, add, http://127.0.0.1:17670, --local, --name, tmachine]
 
@@ -75,12 +92,12 @@
         CONTAINER_ENGINE: podman
         CONTAINER_HOST: unix:///run/user/1000/podman/podman.sock
         HOME: /home/tmachine
-        OPENSHELL_BIN: /usr/local/bin/openshell
+        OPENSHELL_BIN: "{{ podman_e2e_cli }}"
         OPENSHELL_E2E_CONTAINER_ENGINE_UNSET_XDG_CONFIG_HOME: "1"
         OPENSHELL_E2E_DRIVER: podman
-        OPENSHELL_E2E_NETWORK_NAME: tmachine
-        OPENSHELL_E2E_SANDBOX_NAMESPACE: tmachine
-        OPENSHELL_GATEWAY: tmachine
+        OPENSHELL_E2E_NETWORK_NAME: "{{ podman_e2e_gateway }}"
+        OPENSHELL_E2E_SANDBOX_NAMESPACE: "{{ podman_e2e_gateway }}"
+        OPENSHELL_GATEWAY: "{{ podman_e2e_gateway }}"
         OPENSHELL_PODMAN_SOCKET: /run/user/1000/podman/podman.sock
         XDG_RUNTIME_DIR: /run/user/1000
       register: podman_e2e_test_result
@@ -96,9 +113,12 @@
         var: podman_e2e_test_result.stdout_lines
 
     - name: Capture OpenShell gateway journal after Podman E2E test failure
-      become: true
+      become: "{{ podman_e2e_binaries }}"
       ansible.builtin.command:
-        argv: [journalctl, --unit, openshell-gateway.service, --no-pager, --lines, "200"]
+        argv: >-
+          {{ ['journalctl', '--unit', 'openshell-gateway.service', '--no-pager', '--lines', '200']
+             if podman_e2e_binaries else
+             ['journalctl', '--user-unit', 'openshell-gateway.service', '--no-pager', '--lines', '200'] }}
       changed_when: false
       failed_when: false
       when: podman_e2e_test_result.rc != 0