From 2a13e75a776e9eb40d2d60a143248897cc435898 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 7 Oct 2026 13:36:53 +0200 Subject: [PATCH] ci(oci): run shared image tests through package installers Signed-off-by: Evan Lezar --- .github/workflows/branch-e2e.yml | 6 +++--- .github/workflows/release-dev.yml | 6 +++--- .github/workflows/release-tag.yml | 6 +++--- TESTING.md | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/branch-e2e.yml b/.github/workflows/branch-e2e.yml index 9bc186a16..e171d2cc2 100644 --- a/.github/workflows/branch-e2e.yml +++ b/.github/workflows/branch-e2e.yml @@ -276,9 +276,9 @@ jobs: [ {"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"provider-refresh"}, {"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"provider-refresh"}, - {"environment":"ubuntu-docker-rootful","installer":"binaries","testsuite":"oci-image"}, - {"environment":"fedora-podman-rootful","installer":"binaries","testsuite":"oci-image"}, - {"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"oci-image"} + {"environment":"ubuntu-docker-rootful","installer":"deb","testsuite":"oci-image"}, + {"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"oci-image"}, + {"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"oci-image"} ] # Run driver-specific integration tests: diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml index 2470996d0..f9b14bb2e 100644 --- a/.github/workflows/release-dev.yml +++ b/.github/workflows/release-dev.yml @@ -146,9 +146,9 @@ jobs: [ {"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"provider-refresh"}, {"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"provider-refresh"}, - {"environment":"ubuntu-docker-rootful","installer":"binaries","testsuite":"oci-image"}, - {"environment":"fedora-podman-rootful","installer":"binaries","testsuite":"oci-image"}, - {"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"oci-image"} + {"environment":"ubuntu-docker-rootful","installer":"deb","testsuite":"oci-image"}, + {"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"oci-image"}, + {"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"oci-image"} ] docker-e2e: diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index 9da4e1a00..d82d571a3 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -197,9 +197,9 @@ jobs: [ {"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"provider-refresh"}, {"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"provider-refresh"}, - {"environment":"ubuntu-docker-rootful","installer":"binaries","testsuite":"oci-image"}, - {"environment":"fedora-podman-rootful","installer":"binaries","testsuite":"oci-image"}, - {"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"oci-image"} + {"environment":"ubuntu-docker-rootful","installer":"deb","testsuite":"oci-image"}, + {"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"oci-image"}, + {"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"oci-image"} ] docker-e2e: diff --git a/TESTING.md b/TESTING.md index aea4f171d..3347dac0e 100644 --- a/TESTING.md +++ b/TESTING.md @@ -313,11 +313,11 @@ as false passes or silently re-enter the archive. The `oci-image` feature testsuite (`tests/suites/features/oci-image`) checks OCI image identity and working-directory behavior shared by the Docker and -Podman drivers against installed artifacts. CI runs it on Docker rootful, -Podman rootful, and Podman rootless guests: +Podman drivers against installed deb packages on Ubuntu and rpm packages on +Fedora. CI runs it on Docker rootful, Podman rootful, and Podman rootless guests: ```shell -nix run .#tmachine -- test ubuntu-docker-rootful binaries oci-image +nix run .#tmachine -- test ubuntu-docker-rootful deb oci-image ``` The shared suite also runs in the existing ARM64 Docker E2E workflow for