summaryrefslogtreecommitdiffhomepage
path: root/kokoro
diff options
context:
space:
mode:
authorKevin Krakauer <krakauer@google.com>2018-11-28 10:09:22 -0800
committerShentubot <shentubot@google.com>2018-11-28 10:10:13 -0800
commit7b86d36a63e9b281834fdb6c2db0840df992c57c (patch)
tree58ec733c3732ecf92d2c3de3407ec636fb91bc8a /kokoro
parent573622fdcaa5c016d3e047353c729ca73d211c0e (diff)
Fix crictl tests.
gvisor-containerd-shim moved. It now has a stable URL that run_tests.sh always uses. PiperOrigin-RevId: 223188822 Change-Id: I5687c78289404da27becd8d5949371e580fdb360
Diffstat (limited to 'kokoro')
-rwxr-xr-xkokoro/run_tests.sh13
1 files changed, 7 insertions, 6 deletions
diff --git a/kokoro/run_tests.sh b/kokoro/run_tests.sh
index fb9a7f300..927acb6a1 100755
--- a/kokoro/run_tests.sh
+++ b/kokoro/run_tests.sh
@@ -75,8 +75,10 @@ installCrictl() (
sudo -n -E make install
# Install gvisor-containerd-shim.
+ local latest=/tmp/gvisor-containerd-shim-latest
local shim_path=/tmp/gvisor-containerd-shim
- wget https://storage.googleapis.com/cri-containerd-staging/gvisor-containerd-shim/gvisor-containerd-shim -O ${shim_path}
+ wget https://storage.googleapis.com/cri-containerd-staging/gvisor-containerd-shim/latest -O ${latest}
+ wget https://storage.googleapis.com/cri-containerd-staging/gvisor-containerd-shim/$(cat ${latest}) -O ${shim_path}
chmod +x ${shim_path}
sudo -n -E mv ${shim_path} /usr/local/bin
@@ -100,11 +102,10 @@ EOF
)
# Install containerd and crictl.
-# FIXME: gvisor-containerd-shim installation broken.
-#if [[ ${exit_code} -eq 0 ]]; then
-# installCrictl
-# exit_code=${?}
-#fi
+if [[ ${exit_code} -eq 0 ]]; then
+ installCrictl
+ exit_code=${?}
+fi
# Execute local tests that require docker.
if [[ ${exit_code} -eq 0 ]]; then