Skip to content

Commit 5dca743

Browse files
committed
test(e2e): scope the Podman OTLP default and restore upstream lockfiles
The Podman wrapper enabled OTLP export and the agent relay for every e2e run, including single-target CI jobs such as additional_ca. Enable it only for the full suite or a selection that includes otlp_relay, following the SPIFFE fixture pattern; the Docker wrapper stays opt-in. The e2e and features lockfiles had downgraded libsqlite3-sys, crossbeam-queue and hybrid-array against upstream with no manifest change requiring it. Restore upstream's lockfiles and add only the packages the new e2e dependencies pull in. Signed-off-by: Roland Huß <[email protected]>
1 parent 6cd080d commit 5dca743

3 files changed

Lines changed: 30 additions & 26 deletions

File tree

‎e2e/rust/Cargo.lock‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎e2e/rust/e2e-podman.sh‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ RUN_WITH_GATEWAY_COMMAND="__openshell_run_podman_e2e"
1818
# shellcheck source=e2e/support/conformance.sh
1919
source "${ROOT}/e2e/support/conformance.sh"
2020

21-
# Enable OTLP export in the generated gateway config so the otlp_relay test
22-
# can bind a collector stub on this port. Containers reach the host through
23-
# host.containers.internal. Set the variable to an empty string to disable
24-
# export and run the relay's inert case instead.
25-
export OPENSHELL_E2E_OTLP_ENDPOINT="${OPENSHELL_E2E_OTLP_ENDPOINT-http://host.containers.internal:4317}"
26-
2721
# Keep required branch CI on the Podman targets that are known to pass. The
2822
# unfiltered e2e:podman task remains available while the omitted targets are
2923
# stabilized and can be added here.
@@ -107,6 +101,16 @@ if [ "${#SELECTED_TESTS[@]}" -eq 0 ] || [[ " ${SELECTED_TESTS[*]} " == *" provid
107101
export OPENSHELL_E2E_SPIFFE_FIXTURE="${OPENSHELL_E2E_SPIFFE_FIXTURE:-1}"
108102
fi
109103

104+
# When the selection includes otlp_relay, enable OTLP export in the generated
105+
# gateway config so the test can bind a collector stub on this port. All
106+
# selected tests share the gateway, so they run with the relay enabled too.
107+
# Containers reach the host through host.containers.internal. Set the
108+
# variable to an empty string to disable export and run the relay's inert
109+
# case instead.
110+
if [ "${#SELECTED_TESTS[@]}" -eq 0 ] || [[ " ${SELECTED_TESTS[*]} " == *" otlp_relay "* ]]; then
111+
export OPENSHELL_E2E_OTLP_ENDPOINT="${OPENSHELL_E2E_OTLP_ENDPOINT-http://host.containers.internal:4317}"
112+
fi
113+
110114
if [ -n "${OPENSHELL_GATEWAY_ENDPOINT:-}" ] && [ -z "${OPENSHELL_BIN:-}" ]; then
111115
cargo build -p openshell-cli
112116
export OPENSHELL_BIN="${ROOT}/target/debug/openshell"

‎tests/suites/features/Cargo.lock‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)