diff options
| author | Kevin Krakauer <krakauer@google.com> | 2018-11-01 18:28:12 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-11-01 18:29:07 -0700 |
| commit | 704b56a40d0a041a4e6f814c3dbb1f9ec15f9002 (patch) | |
| tree | 9b5946daeb6eb660a81376a364d46257d1ab1503 /kokoro/run_tests.sh | |
| parent | 5cd55cd90fd5a32685807a57617cde6f5f76d22b (diff) | |
First crictl integration tests.
More tests will come, but it's worth getting what's done so far reviewed.
PiperOrigin-RevId: 219734531
Change-Id: If15ca6e6855e3d1cc28c83b5f9c3a72cb65b2e59
Diffstat (limited to 'kokoro/run_tests.sh')
| -rwxr-xr-x | kokoro/run_tests.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kokoro/run_tests.sh b/kokoro/run_tests.sh index b4952cedd..bfdb3fe09 100755 --- a/kokoro/run_tests.sh +++ b/kokoro/run_tests.sh @@ -80,7 +80,7 @@ installCrictl() ( chmod +x ${shim_path} sudo -n -E mv ${shim_path} /usr/local/bin - # Configure containerd. + # Configure containerd-shim. local shim_config_path=/etc/containerd local shim_config_tmp_path=/tmp/gvisor-containerd-shim.toml sudo -n -E mkdir -p ${shim_config_path} @@ -89,11 +89,14 @@ installCrictl() ( [runsc_config] debug = "true" - debug-log = "/tmp/runsc-log/" + debug-log = "/tmp/runsc-logs/" strace = "true" file-access = "shared" EOF sudo mv ${shim_config_tmp_path} ${shim_config_path} + + # Configure CNI. + sudo -n -E env PATH=${PATH} ${GOPATH}/src/github.com/containerd/containerd/script/setup/install-cni ) # Install containerd and crictl. @@ -128,7 +131,7 @@ if [[ ${exit_code} -eq 0 ]]; then echo "root_test executable not found" exit 1 fi - sudo -n -E RUNSC_RUNTIME=${runtime} ${root_test} + sudo -n -E RUNSC_RUNTIME=${runtime} RUNSC_EXEC=/tmp/${runtime}/runsc ${root_test} exit_code=${?} fi |