fix(e2e): align container engine selection across helpers#1944
Conversation
|
Label |
b6685c6 to
66bdf87
Compare
|
@elezar it looks like if the env vars are left unset / empty, then the rust helper will fall back to docker but the shell script will pick podman if it's installed. I'm not sure how likely it is that someone has both installed and someone bypasses the wrappers by running e2e/rust/src/harness/container.rs:228-230 Ok(explicit_engine
.or(required_engine)
.unwrap_or_else(|| "docker".to_string()))tasks/scripts/container-engine.sh:87-103 if command -v podman >/dev/null 2>&1; then
echo "podman"
return
fi |
Signed-off-by: Evan Lezar <elezar@nvidia.com>
66bdf87 to
742fe5a
Compare
Summary
Align container engine selection across build helpers, e2e wrappers, Rust e2e support containers, and Skaffold local image builds.
CONTAINER_ENGINE=docker|podmanis now the single explicit selector, withCONTAINER_ENGINE_TARGET=local-k8s-clusterused only for local-cluster image workflows.Related Issue
Closes #1481
Changes
tasks/scripts/container-engine.sh: explicitCONTAINER_ENGINE, e2e driver requirement, local-cluster target hint, then host auto-detection.OPENSHELL_E2E_CONTAINER_ENGINEselector and conflicting explicit engine selections.ce_info_archso malformed or unavailable engine metadata fails directly instead of falling back to host architecture.CONTAINER_ENGINE_TARGET=local-k8s-cluster.architecture/build.md.Testing
mise run pre-commitpassesCommands run:
bash -n tasks/scripts/container-engine.shbash -n e2e/with-docker-gateway.shbash -n e2e/with-podman-gateway.shgit diff --checkmarkdownlint-cli2 architecture/build.mdce_info_archstderr-warning handling, andce_info_archfailure diagnostics.mise exec -- cargo test --manifest-path e2e/rust/Cargo.toml --lib harness::containermise exec -- cargo clippy --manifest-path e2e/rust/Cargo.toml --all-targets -- -D warningsmise run pre-commitNot run:
podmanis not installed on this machine.Checklist