diff --git a/Vagrantfile b/Vagrantfile index d251c1c1cc..16acaf08fb 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -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 diff --git a/script/test/cri-integration.sh b/script/test/cri-integration.sh index 1ac35bad1c..fd696430ae 100755 --- a/script/test/cri-integration.sh +++ b/script/test/cri-integration.sh @@ -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 \