Skip to content

test(oci): share OCI USER and WORKDIR checks across Docker and Podman #3931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
matthewgrossman wants to merge 3 commits into from
Draft

test(oci): share OCI USER and WORKDIR checks across Docker and Podman #3931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36847f0
test(oci): share OCI image checks across Docker and Podman
matthewgrossman Sep 30, 2026
7759670
test(oci): require WorkspaceValidationFailed and cover image USER fal…
matthewgrossman Sep 30, 2026
7658c9f
test(podman): leave shared OCI identity checks to the oci-image suite
matthewgrossman Sep 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/branch-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,10 @@ jobs:
test-matrix: >-
[
{"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"provider-refresh"},
{"environment":"fedora-podman-rootless","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"}
]

# Run driver-specific integration tests:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/release-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,10 @@ jobs:
test-matrix: >-
[
{"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"provider-refresh"},
{"environment":"fedora-podman-rootless","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"}
]

docker-e2e:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/release-tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,10 @@ jobs:
test-matrix: >-
[
{"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"provider-refresh"},
{"environment":"fedora-podman-rootless","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"}
]

docker-e2e:
Expand Down
19 changes: 18 additions & 1 deletion TESTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,23 @@ binary. `tests/artifacts.nix` keeps the follow-up exclusions explicit and uses
the same filter for the generated inventory, so excluded binaries cannot appear
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:

```shell
nix run .#tmachine -- test ubuntu-docker-rootful binaries oci-image
```

Run it against a local gateway by naming the command that builds images into
the gateway's image store:

```shell
OPENSHELL_TEST_CONTAINER_ENGINE=podman e2e/with-podman-gateway.sh \
cargo test --manifest-path tests/suites/features/Cargo.toml -p openshell-test-feature-oci-image -- --test-threads 1
```

Run the VM-backed Rust CLI e2e suite:

```shell
Expand Down Expand Up @@ -490,7 +507,7 @@ cargo test --manifest-path e2e/rust/Cargo.toml --features e2e --test sync
Run a single Docker-only test directly with cargo:

```shell
cargo test --manifest-path e2e/rust/Cargo.toml --features e2e-docker --test custom_image
cargo test --manifest-path e2e/rust/Cargo.toml --features e2e-docker --test docker_preflight
```

The harness (`e2e/rust/src/harness/`) provides:
Expand Down
5 changes: 0 additions & 5 deletions e2e/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@ name = "vm_overlay"
path = "tests/vm_overlay.rs"
required-features = ["e2e-vm"]

[[test]]
name = "custom_image"
path = "tests/custom_image.rs"
required-features = ["e2e-docker"]

[[test]]
name = "service_bearer_passthrough"
path = "tests/service_bearer_passthrough.rs"
Expand Down
253 changes: 0 additions & 253 deletions e2e/rust/tests/custom_image.rs
View file
Open in desktop

This file was deleted.

Loading
Loading