Skip to content

Commit d598c03

Browse files
committed
ci(tmachine): qualify package-installed Podman drivers
Signed-off-by: Evan Lezar <elezar@nvidia.com>
1 parent d24c126 commit d598c03

3 files changed

Lines changed: 47 additions & 11 deletions

File tree

‎.github/workflows/branch-e2e.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ jobs:
279279
]
280280
281281
# Run driver-specific integration tests:
282-
# These suites require the binary installer's CLI path, local HTTP gateway,
283-
# and system service configuration for their Podman user-namespace fixtures.
282+
# Exercise the packaged gateway service and credentials. Namespace fixtures
283+
# use the installer-published service owner and active XDG configuration.
284284
driver-specific-integration:
285285
needs: prepare-integration
286286
permissions:
@@ -294,9 +294,9 @@ jobs:
294294
integration-inputs-artifact-id: ${{ needs.prepare-integration.outputs.integration_inputs_artifact_id }}
295295
test-matrix: >-
296296
[
297-
{"environment":"fedora-podman-rootful","installer":"binaries","testsuite":"driver-podman"},
298-
{"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"e2e-podman"},
299-
{"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"driver-podman"}
297+
{"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"driver-podman"},
298+
{"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"e2e-podman"},
299+
{"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"driver-podman"}
300300
]
301301
302302
docker-e2e:

‎CI.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,10 @@ selected. DEB and RPM packages build only when integration qualification is sele
7777
the DEB on Ubuntu with Docker and installs the CLI and gateway RPMs on Fedora with
7878
rootful and rootless Podman. These lanes run conformance using the matching runtime
7979
images. Release Dev and Release Tag use the same package installers.
80-
Fedora provider-refresh tests also use RPMs. The Podman driver-specific suites
81-
retain the binary installer because their fixtures configure its system service,
82-
local HTTP gateway, and CLI path. The manual Integration Tests workflow defaults
80+
Fedora provider-refresh tests also use RPMs. The Podman driver-specific branch
81+
lanes use RPMs for rootful and rootless user-namespace comparisons and rootless
82+
Podman E2E. Their fixtures use the installed gateway's registration, active
83+
configuration, and service context. The manual Integration Tests workflow defaults
8384
to the package installers and downloads the packages selected by its matrix.
8485

8586
Three opt-in labels enable the long-running E2E suites:

‎TESTING.md‎

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,14 +286,49 @@ Rust tests that still apply. Run the Podman-backed Rust CLI e2e suite:
286286
mise run e2e:podman
287287
```
288288

289-
Run the portable subset in a disposable rootless Podman guest:
289+
Run the portable subset in a disposable rootless Podman guest. Stage matching
290+
candidate CLI and gateway RPMs at `artifacts/packages/rpm/openshell.rpm` and
291+
`artifacts/packages/rpm/openshell-gateway.rpm`; `build-artifacts` builds the
292+
binary, runtime-image, and test inputs but does not build these packages:
290293

291294
```shell
292295
nix run .#build-artifacts
293-
nix run .#tmachine -- test fedora-podman-rootless binaries e2e-podman
294-
nix run .#tmachine -- test fedora-podman-rootless binaries driver-podman
296+
nix run .#tmachine -- test fedora-podman-rootless rpm e2e-podman
297+
nix run .#tmachine -- test fedora-podman-rootless rpm driver-podman
295298
```
296299

300+
The driver suites also support the `binaries` installer. The shared installer
301+
roles save the active gateway configuration, registration name, service scope,
302+
service owner, and network name in `/var/lib/openshell-test/gateway.yaml`.
303+
Suites resolve `openshell` from PATH and use that registration, including the
304+
packaged gateway's HTTPS client credentials. Namespace fixtures modify the
305+
installed TOML and restart its system or user service. Package metadata points
306+
to the service owner's XDG `gateway.toml`, which can be absent when the service
307+
uses defaults and `gateway.env`. The default namespace comparison preserves
308+
that state; configured profiles create a minimal versioned TOML override only
309+
if the package has not seeded one.
310+
311+
Failure diagnostics select the matching journal unit and user ID. Missing
312+
metadata or credentials fail the run; suites do not replace package setup with
313+
an HTTP gateway.
314+
315+
Before merging harness changes, run all three driver-specific combinations
316+
locally: rootful RPM `driver-podman`, rootless RPM `driver-podman`, and rootless
317+
RPM `e2e-podman`. Use matching candidate packages, runtime images, and test
318+
archives. Add `test:e2e` to the PR and check that its branch integration jobs ran
319+
and passed; a successful workflow with skipped jobs does not validate these
320+
changes.
321+
322+
Ansible sources participate in tmachine's installation cache
323+
hash, so older cached installations are rebuilt with this metadata.
324+
325+
The `driver-podman` and `e2e-podman` suites support rootful and rootless Podman.
326+
Rootful tmachine setup grants the `tmachine` group access to the Podman socket
327+
so workload image loading and E2E tests run as the local user.
328+
DEB and RPM installers share the gateway role; available environments pair
329+
DEB with Ubuntu/Docker and RPM with Fedora/Podman. A DEB/Podman run requires an
330+
Ubuntu Podman environment.
331+
297332
Print the exact tmachine archive selection as a shell `PODMAN_CI_TESTS` array:
298333

299334
```shell

0 commit comments

Comments
 (0)