Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/branch-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ jobs:
cargo fmt --manifest-path tests/tmachine/Cargo.toml --all -- --check
cargo fmt --manifest-path tests/runner/Cargo.toml --all -- --check
cargo fmt --manifest-path tests/suites/conformance/Cargo.toml --all -- --check
cargo fmt --manifest-path tests/suites/drivers/docker/Cargo.toml --all -- --check
cargo fmt --manifest-path tests/suites/drivers/podman/Cargo.toml --all -- --check
cargo fmt --manifest-path tests/suites/features/Cargo.toml --all -- --check
cargo fmt --manifest-path tests/support/Cargo.toml --all -- --check
Expand Down Expand Up @@ -359,6 +360,7 @@ jobs:
cargo clippy --locked --manifest-path tests/tmachine/Cargo.toml --all-targets -- -D warnings
cargo clippy --locked --manifest-path tests/runner/Cargo.toml --all-targets -- -D warnings
cargo clippy --locked --manifest-path tests/suites/conformance/Cargo.toml --workspace --all-targets -- -D warnings
cargo clippy --locked --manifest-path tests/suites/drivers/docker/Cargo.toml --workspace --all-targets -- -D warnings
cargo clippy --locked --manifest-path tests/suites/drivers/podman/Cargo.toml --workspace --all-targets -- -D warnings
cargo clippy --locked --manifest-path tests/suites/features/Cargo.toml --workspace --all-targets -- -D warnings
cargo clippy --locked --manifest-path tests/support/Cargo.toml --all-targets -- -D warnings
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/branch-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ jobs:
set -euo pipefail
# Retry dependency preparation, then build once.
nix build --no-link .#openshell-test-runner || nix build --no-link .#openshell-test-runner
for family in features drivers/podman; do
for family in features drivers/docker drivers/podman; do
nix run .#openshell-test-runner -- build \
--family "$family" --out "artifacts/e2e-bundles/${family//\//-}"
done
Expand All @@ -257,6 +257,12 @@ jobs:
path: artifacts/e2e-bundles/features
retention-days: 5
if-no-files-found: error
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: openshell-e2e-bundle-drivers-docker-x86_64-unknown-linux-musl
path: artifacts/e2e-bundles/drivers-docker
retention-days: 5
if-no-files-found: error
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: openshell-e2e-bundle-drivers-podman-x86_64-unknown-linux-musl
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/e2e-suites.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
# results. With `prebuilt`, the rows run what the caller built once for the
# run instead: conformance rows the static `openshell-conformance`, the other
# rows their family's test bundle. The `family` input selects the rows of one
# family, including the workspaces under it (drivers selects drivers/podman);
# leave it empty to run every row.
# family, including the workspaces under it (drivers selects drivers/docker
# and drivers/podman); leave it empty to run every row.

name: E2E Suites

Expand Down Expand Up @@ -90,6 +90,9 @@ jobs:
{"environment":"ubuntu-docker-rootful-cdi","installer":"deb","family":"features","package":"cdi","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootful-cdi","installer":"rpm","family":"features","package":"cdi","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootless-cdi","installer":"rpm","family":"features","package":"cdi","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"ubuntu-docker-rootful-driver-config","installer":"deb","family":"features","package":"driver-config","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootful-driver-config","installer":"rpm","family":"features","package":"driver-config","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootless-driver-config","installer":"rpm","family":"features","package":"driver-config","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"ubuntu-docker-rootful-keycloak","installer":"deb","family":"features","package":"keycloak-provider-refresh","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"ubuntu-docker-rootful","installer":"deb","family":"features","package":"oci-image","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootful","installer":"rpm","family":"features","package":"oci-image","gateway":"openshell","runner":"ubuntu-24.04"},
Expand All @@ -104,8 +107,15 @@ jobs:
{"environment":"ubuntu-k3s","installer":"k3s","family":"features","package":"routable-host-ip","gateway":"tmachine","runner":"ubuntu-24.04"},
{"environment":"ubuntu-k3s","installer":"k3s-ha","family":"features","package":"routable-host-ip","gateway":"tmachine","runner":"ubuntu-24.04"},
{"environment":"ubuntu-docker-rootful","installer":"deb","family":"features","package":"connect-ssh-supervision","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"ubuntu-docker-rootful","installer":"deb","family":"features","package":"resource-limits","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootful","installer":"rpm","family":"features","package":"resource-limits","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootless","installer":"rpm","family":"features","package":"resource-limits","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"ubuntu-docker-rootful","installer":"deb","family":"features","package":"ocsf","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootful","installer":"rpm","family":"features","package":"ocsf","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootless","installer":"rpm","family":"features","package":"ocsf","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootful-keycloak","installer":"rpm","family":"features","package":"keycloak-provider-refresh","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootless-keycloak","installer":"rpm","family":"features","package":"keycloak-provider-refresh","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"ubuntu-docker-rootful","installer":"deb","family":"drivers/docker","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootful-userns-default","installer":"rpm","family":"drivers/podman","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootful-userns-auto","installer":"rpm","family":"drivers/podman","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootful-userns-keep-id","installer":"rpm","family":"drivers/podman","gateway":"openshell","runner":"ubuntu-24.04"},
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
run: |
set -euo pipefail
nix build --no-link .#openshell-test-runner || nix build --no-link .#openshell-test-runner
for family in features drivers/podman; do
for family in features drivers/docker drivers/podman; do
nix run .#openshell-test-runner -- build \
--family "$family" --out "$RUNNER_TEMP/e2e-bundles/${family//\//-}"
done
10 changes: 5 additions & 5 deletions CI.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ selected. DEB and RPM packages build only when integration qualification is sele
the DEB on Ubuntu with Docker and installs the CLI and gateway RPMs on Fedora with
rootful and rootless Podman. These lanes run conformance using the matching runtime
images. Release Dev, Release, and Pre-release use the same package installers.
The feature suites (`tests/suites/features`) and the Podman driver suite
(`tests/suites/drivers/podman`) run the same way, on the package installers; the
driver suite's environments merge their Podman settings into the packaged
gateway's configuration (see `TESTING.md`). The `e2e-podman` lane runs on the
RPM installer as well. The driver suite and `e2e-podman` run
The feature suites (`tests/suites/features`) and the Docker and Podman driver
suites (`tests/suites/drivers/{docker,podman}`) run the same way, on the package
installers; the Podman driver suite's environments merge their Podman settings
into the packaged gateway's configuration (see `TESTING.md`). The `e2e-podman`
lane runs on the RPM installer as well. The driver suites and `e2e-podman` run
only in `Branch E2E Checks`. The manual Integration Tests workflow runs the
remaining tmachine testsuites, such as `e2e-podman`, and downloads the packages
selected by its matrix.
Expand Down
17 changes: 12 additions & 5 deletions TESTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,11 @@ can run the suite. The expectations characterize the sandbox's behavior today,
not a specification, and the `echo-socket` check needs `perl` in the workload
image, which the default image has.

The `<base>-driver-config` environments let callers pass driver config with
volume and bind mounts, and turn off resource admission, which blocks bind
mounts. The driver-config suite (`tests/suites/features/driver-config`) runs
there on Docker and Podman.

### Python E2E (`e2e/python/`)

`mise run e2e:python` builds `openshell/e2e-python:dev` from
Expand Down Expand Up @@ -567,18 +572,20 @@ nix run .#generate-podman-e2e-ci-tests
The `e2e-podman` testsuite runs a nextest archive built with the corresponding
Rust feature and preloads its Python workload image into the rootless Podman
store. The E2E archive excludes binaries that still depend on wrapper-owned
gateway controls, SPIFFE fixtures, the caller driver-config setting, or other
guest setup. `tests/tmachine/artifacts.nix` keeps the follow-up exclusions explicit and uses
gateway controls, SPIFFE fixtures, or other guest setup. `tests/tmachine/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.

Driver suites live in `tests/suites/drivers/<driver>`, with the package named
after the driver. Each driver suite is its own workspace with its own lockfile,
so a change to one driver's tests or dependencies doesn't touch another's. Add
a new one to the `rust:format`, `rust:format:check` and `rust:lint` tasks, the
matching lines in `branch-checks.yml`, and `ALIGNED_WORKSPACES`. The Podman
driver suite (`tests/suites/drivers/podman`) compares OpenShell and direct
Podman user-namespace mappings.
matching lines in `branch-checks.yml`, `ALIGNED_WORKSPACES`, and the bundle
builds in `branch-e2e.yml` and `rust-cache.yml`. The Docker and Podman driver
suites (`tests/suites/drivers/{docker,podman}`) check what the driver does with
a sandbox's containers when its workload stops or an ephemeral sandbox
finishes. The Podman suite also compares OpenShell and direct Podman
user-namespace mappings.
Each `fedora-podman-{rootful,rootless}-userns-<mode>` environment configures
the gateway with one mode (`default`, `auto`, `keep-id` or `private`) and works
with every installer; CI runs it with `rpm`:
Expand Down
107 changes: 0 additions & 107 deletions e2e/rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions e2e/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,6 @@ name = "additional_ca"
path = "tests/additional_ca.rs"
required-features = ["e2e-additional-ca"]

[[test]]
name = "driver_config_volume"
path = "tests/driver_config_volume.rs"
required-features = ["e2e-local-container-driver"]

[[test]]
name = "gateway_start"
path = "tests/gateway_start.rs"
Expand Down Expand Up @@ -139,11 +134,6 @@ name = "podman_corporate_proxy"
path = "tests/podman_corporate_proxy.rs"
required-features = ["e2e-podman"]

[[test]]
name = "podman_resource_limits"
path = "tests/podman_resource_limits.rs"
required-features = ["e2e-podman"]

[[test]]
name = "provider_refresh_handles"
path = "tests/provider_refresh_handles.rs"
Expand Down Expand Up @@ -234,7 +224,6 @@ openshell-crypto = { path = "../../crates/openshell-crypto" }
openshell-otel-test-support = { path = "../../crates/openshell-otel-test-support" }
opentelemetry-proto = { version = "0.33", default-features = false, features = ["gen-tonic", "trace"] }
base64 = "0.22"
bollard = "0.20"
bytes = "1"
futures-util = "0.3"
http-body-util = "0.1"
Expand Down
1 change: 0 additions & 1 deletion e2e/rust/e2e-podman.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ source "${ROOT}/e2e/support/conformance.sh"
# stabilized and can be added here.
PODMAN_CI_TESTS=(
ephemeral_cleanup
driver_config_volume
edge_tunnel_e2e
host_gateway_alias
local_driver_token_restart
Expand Down
Loading
Loading