github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

cri-integration: pass ENABLE_CRI_SANDBOXES to test

Browse Source 
ENABLE_CRI_SANDBOXES is already passed to the daemon, but was not passed
to the tests prior to this commit. Passing ENABLE_CRI_SANDBOXES to the
tests allows tests to be skipped if they're not appropriate for sbserver
(or the functionality hasn't been implemented in sbserver yet).

Signed-off-by: Samuel Karp <samuelkarp@google.com>
This commit is contained in:
Samuel Karp 2022-09-23 13:14:31 -07:00
parent 12b447606a
commit 7a66f70b5b
No known key found for this signature in database
GPG Key ID: 997C5A3CD3167CB5
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
script/test/cri-integration.sh
View File

@ -42,7 +42,17 @@ mkdir -p "${REPORT_DIR}"
test_setup "${REPORT_DIR}" test_setup "${REPORT_DIR}"
# Run integration test. # Run integration test.
${sudo} bin/cri-integration.test --test.run="${FOCUS}" --test.v \ CMD=""
if [ -n "${sudo}" ]; then
CMD+="${sudo} "
# sudo strips environment variables, so add ENABLE_CRI_SANDBOXES back if present
if [ -n "${ENABLE_CRI_SANDBOXES}" ]; then
CMD+="ENABLE_CRI_SANDBOXES='${ENABLE_CRI_SANDBOXES}' "
fi
fi
CMD+="${PWD}/bin/cri-integration.test"
${CMD} --test.run="${FOCUS}" --test.v \
--cri-endpoint="${CONTAINERD_SOCK}" \ --cri-endpoint="${CONTAINERD_SOCK}" \
--cri-root="${CRI_ROOT}" \ --cri-root="${CRI_ROOT}" \
--runtime-handler="${RUNTIME}" \ --runtime-handler="${RUNTIME}" \