dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-08-08 17:11:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Forward RUNC_FLAVOR env var down to integration tests

Browse Source 
Update Vagrantfile and cri-integration test runner to forward
RUNC_FLAVOR to the test environment.

Allows integration tests to conditionally skip testing certain cgroup
mount setups when running against other runtimes that may not support
them yet.

Signed-off-by: Chris Henzie <chrishenzie@gmail.com>
This commit is contained in:
Chris Henzie
2026-03-10 17:14:48 -07:00
parent f84ddfa4fb
commit d2f67d3990
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@@ -278,6 +278,7 @@ EOF
'GOTESTSUM_JSONFILE': ENV['GOTESTSUM_JSONFILE'],
'GITHUB_WORKSPACE': '',
'CGROUP_DRIVER': ENV['CGROUP_DRIVER'],
'RUNC_FLAVOR': ENV['RUNC_FLAVOR'] || "runc",
}
sh.inline = <<~SHELL
#!/usr/bin/env bash
@@ -306,6 +307,7 @@ EOF
'GOTEST': ENV['GOTEST'] || "go test",
'REPORT_DIR': ENV['REPORT_DIR'],
'CGROUP_DRIVER': ENV['CGROUP_DRIVER'],
'RUNC_FLAVOR': ENV['RUNC_FLAVOR'] || "runc",
}
sh.inline = <<~SHELL
#!/usr/bin/env bash

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

@@ -46,6 +46,10 @@ CMD=""
if [ -n "${sudo}" ]; then
CMD+="${sudo} "
fi
CMD+="env "
if [ -n "${RUNC_FLAVOR:-}" ]; then
CMD+="RUNC_FLAVOR=${RUNC_FLAVOR} "
fi
CMD+="${PWD}/bin/cri-integration.test"
${CMD} --test.run="${FOCUS}" --test.v \