Skip to content

Commit 9d5f869

Browse files
fix(e2e): align podman e2e labels with centralized driver constants
The podman driver moved its container labels to the centralized openshell.ai/ prefix, but the e2e test harness and cleanup script still referenced the old openshell.sandbox-* keys, causing the local_driver_token_restart test to fail on container lookup. Signed-off-by: Derek Carr <decarr@redhat.com>
1 parent e269a17 commit 9d5f869

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎e2e/rust/tests/local_driver_token_restart.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl LocalDriver {
7171
],
7272
Self::Podman => vec![
7373
"label=openshell.managed=true".to_string(),
74-
format!("label=openshell.sandbox-name={sandbox_name}"),
74+
format!("label=openshell.ai/sandbox-name={sandbox_name}"),
7575
],
7676
Self::Vm => Vec::new(),
7777
}

‎e2e/with-podman-gateway.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ cleanup() {
114114
elif [ -n "${E2E_NAMESPACE}" ]; then
115115
sandbox_ids="$(podman_cmd ps -aq \
116116
--filter "label=openshell.managed=true" \
117-
--filter "label=openshell.sandbox-namespace=${E2E_NAMESPACE}" \
117+
--filter "label=openshell.ai/sandbox-namespace=${E2E_NAMESPACE}" \
118118
2>/dev/null || true)"
119119
fi
120120
fi
@@ -133,7 +133,7 @@ cleanup() {
133133
if [ -n "${sandbox_ids}" ]; then
134134
for id in ${sandbox_ids}; do
135135
local sandbox_id
136-
sandbox_id="$(podman_cmd inspect --format '{{ index .Config.Labels "openshell.sandbox-id" }}' "${id}" 2>/dev/null || true)"
136+
sandbox_id="$(podman_cmd inspect --format '{{ index .Config.Labels "openshell.ai/sandbox-id" }}' "${id}" 2>/dev/null || true)"
137137
podman_cmd rm -f "${id}" >/dev/null 2>&1 || true
138138
if [ -n "${sandbox_id}" ] && [ "${sandbox_id}" != "<no value>" ]; then
139139
podman_cmd volume rm -f "openshell-sandbox-${sandbox_id}-workspace" >/dev/null 2>&1 || true
@@ -173,7 +173,7 @@ ensure_e2e_podman_network() {
173173
podman_cmd network create \
174174
--driver bridge \
175175
--label openshell.managed=true \
176-
--label "openshell.sandbox-namespace=${E2E_NAMESPACE}" \
176+
--label "openshell.ai/sandbox-namespace=${E2E_NAMESPACE}" \
177177
"${network}" >/dev/null
178178
PODMAN_NETWORK_MANAGED=1
179179
}

0 commit comments

Comments
 (0)