Skip to content

Commit 1c9ecd8

Browse files
authored
ci(oci): run shared image tests through package installers
Signed-off-by: Evan Lezar <elezar@nvidia.com>
1 parent bc94afa commit 1c9ecd8

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,9 @@ jobs:
276276
[
277277
{"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"provider-refresh"},
278278
{"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"provider-refresh"},
279-
{"environment":"ubuntu-docker-rootful","installer":"binaries","testsuite":"oci-image"},
280-
{"environment":"fedora-podman-rootful","installer":"binaries","testsuite":"oci-image"},
281-
{"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"oci-image"}
279+
{"environment":"ubuntu-docker-rootful","installer":"deb","testsuite":"oci-image"},
280+
{"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"oci-image"},
281+
{"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"oci-image"}
282282
]
283283
284284
# Run driver-specific integration tests:

‎.github/workflows/release-dev.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ jobs:
146146
[
147147
{"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"provider-refresh"},
148148
{"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"provider-refresh"},
149-
{"environment":"ubuntu-docker-rootful","installer":"binaries","testsuite":"oci-image"},
150-
{"environment":"fedora-podman-rootful","installer":"binaries","testsuite":"oci-image"},
151-
{"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"oci-image"}
149+
{"environment":"ubuntu-docker-rootful","installer":"deb","testsuite":"oci-image"},
150+
{"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"oci-image"},
151+
{"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"oci-image"}
152152
]
153153
154154
docker-e2e:

‎.github/workflows/release-tag.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@ jobs:
197197
[
198198
{"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"provider-refresh"},
199199
{"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"provider-refresh"},
200-
{"environment":"ubuntu-docker-rootful","installer":"binaries","testsuite":"oci-image"},
201-
{"environment":"fedora-podman-rootful","installer":"binaries","testsuite":"oci-image"},
202-
{"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"oci-image"}
200+
{"environment":"ubuntu-docker-rootful","installer":"deb","testsuite":"oci-image"},
201+
{"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"oci-image"},
202+
{"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"oci-image"}
203203
]
204204
205205
docker-e2e:

‎TESTING.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,11 +313,11 @@ as false passes or silently re-enter the archive.
313313

314314
The `oci-image` feature testsuite (`tests/suites/features/oci-image`) checks
315315
OCI image identity and working-directory behavior shared by the Docker and
316-
Podman drivers against installed artifacts. CI runs it on Docker rootful,
317-
Podman rootful, and Podman rootless guests:
316+
Podman drivers against installed deb packages on Ubuntu and rpm packages on
317+
Fedora. CI runs it on Docker rootful, Podman rootful, and Podman rootless guests:
318318

319319
```shell
320-
nix run .#tmachine -- test ubuntu-docker-rootful binaries oci-image
320+
nix run .#tmachine -- test ubuntu-docker-rootful deb oci-image
321321
```
322322

323323
The shared suite also runs in the existing ARM64 Docker E2E workflow for

0 commit comments

Comments
 (0)