Repository navigation
ci(e2e): trim the host Podman lane to tests tmachine can't run yet - #5424
matthewgrossman wants to merge 1 commit into
Conversation
The rust-podman-ci lane ran conformance and 23 e2e/rust binaries. The tmachine e2e-podman row already runs 17 of those binaries, and the tmachine Podman conformance rows run the same conformance tests. Keep only the six binaries no other lane covers: the five wrapper-lane entries in podmanE2eFollowUpBinaries, plus otlp_relay, whose collector cases need the OTLP endpoint the wrapper configures. Skip conformance for the ci set and drop the lane's build-conformance dependency. Closes #5423 Signed-off-by: Matthew Grossman <mgrossman@nvidia.com>
|
/ok to test 48b2996 |
|
Label |
|
🌿 Preview your docs: https://nvidia-preview-pr-5424.docs.buildwithfern.com/openshell |
|
Closing without merging. Trimming the lane now adds a second list to keep in sync with podmanE2eFollowUpBinaries while the #5297 migration is moving these tests. The job will be deleted in one step after #5297 PR6 ports the last host-only binaries; tracked in #5423. The verification in this PR's description still applies. |
Summary
Trim the host Podman lane (
podman-e2e / E2E (rust-podman-ci, ubuntu-26.04)) to the sixe2e/rustbinaries that no other lane runs, and stop it running conformance. tmachine already covers everything else this lane ran.Related Issue
Closes #5423 (part of #5281)
Changes
e2e/rust/e2e-podman.sh:PODMAN_CI_TESTSgoes from 23 binaries to 6. Theciset no longer runsopenshell-conformance..github/workflows/branch-e2e.yml:podman-e2eno longer needsbuild-conformanceor downloads the prebuilt conformance program.tests/tmachine/artifacts.nix: thepodmanE2eFollowUpBinariescomment points at the new host list.tasks/test.toml: thee2e:podman:cidescription says what it now runs.Verification
I compared the jobs in Branch E2E run 42694439028: the host lane,
podman-e2e-integration(tmachinee2e-podmanrow), the tmachine conformance rows, anddocker-e2e / rust-docker.1. e2e/rust binaries. The tmachine row ran 58 tests across 36 binaries, all passing. It includes 17 of the 23 host binaries, plus about 11 the host lane didn't run. The six it doesn't cover:
provider_token_exchangee2e-podman)podman_corporate_proxypodman_gateway_startlocal_driver_token_restartdriver_config_volumeallow_driver_configandenable_bind_mountsotlp_relayOPENSHELL_E2E_OTLP_ENDPOINT. Elsewhere its two collector cases skip themselves and pass.The first five are the "wrapper lane" entries in
podmanE2eFollowUpBinaries. The host lane keeps the env it set for these: the SPIFFE fixture and the OTLP endpoint are still set, because both are keyed on the selected tests. The host lane runs Ubuntu 26.04 with Ubuntu's Podman 5.7.0 as the runner user. The tmachine row runs Fedora rootless Podman with a binaries-installed gateway.2. Conformance. The host lane and the tmachine
fedora-podman-rootlessrow ran the same 15openshell-conformancetests (checked against that row'sjunit.xml). Thefedora-podman-rootfulrow runs them too. Nothing is lost by skipping it here.3. Other callers. No other workflow uses this lane or
e2e:podman:ci: not Release Dev, Pre-release or Release Canary.Core E2E resultstill needspodman-e2e, unchanged.podman-additional-ca-e2eandpodman-external-driver-e2eare separate lanes and unchanged. No skills or docs pages name this lane.Why trim instead of delete
The #5297 plan ports all six binaries to testkit:
driver_config_volumeandlocal_driver_token_restartin PR5, the rest in PR6. Deleting the lane now would leave them uncovered until those land. Trimming keeps their coverage, and each port removes its entry fromPODMAN_CI_TESTS. After PR6, thepodman-e2ejob ande2e:podman:cican be deleted.Trade-off
build-conformance. It still buildse2e/rust. It's not the slowest lane, so wall time doesn't improve. Fewer Podman stop/start tests run here, so it's less exposed to theContainerExitedflake (bug(podman): polled snapshot moves a restarting sandbox from Starting to Error (ContainerExited) #5258, fix in fix(server): skip the reconcile poll of a sandbox whose start is in progress #5265).Testing
shellcheck -x e2e/rust/e2e-podman.shactionlint .github/workflows/branch-e2e.ymlpodman-e2eran only the six binaries (11 tests, all passed), skipped conformance, and took 5 min 44 s (was about 13 min). The first attempt failed on an unrelated GHCR pushpermission_deniedinbuild-images / gateway; a rerun passed.Checklist