diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-07-13 16:10:58 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-07-13 16:10:58 -0700 |
| commit | c81ac8ec3b78f898e75830a93b5ed3085b785fd6 (patch) | |
| tree | 03042d0bb4b544533d08da6625069d3e6c10d657 /scripts | |
| parent | 59a5479409094b141a60cfcc65f0a53d7871e2e1 (diff) | |
| parent | 2afff44403e046078301de39f0252bb57fc018c7 (diff) | |
Merge pull request #2672 from amscanne:shim-integrated
PiperOrigin-RevId: 321053634
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/root_tests.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/scripts/root_tests.sh b/scripts/root_tests.sh index d629bf2aa..3eb735e62 100755 --- a/scripts/root_tests.sh +++ b/scripts/root_tests.sh @@ -17,15 +17,8 @@ source $(dirname $0)/common.sh make load-all-images - -# Reinstall the latest containerd shim. -declare -r base="https://storage.googleapis.com/cri-containerd-staging/gvisor-containerd-shim" -declare -r latest=$(mktemp --tmpdir gvisor-containerd-shim-latest.XXXXXX) -declare -r shim_path=$(mktemp --tmpdir gvisor-containerd-shim.XXXXXX) -wget --no-verbose "${base}"/latest -O ${latest} -wget --no-verbose "${base}"/gvisor-containerd-shim-$(cat ${latest}) -O ${shim_path} -chmod +x ${shim_path} -sudo mv ${shim_path} /usr/local/bin/gvisor-containerd-shim +CONTAINERD_VERSION=1.3.4 make sudo TARGETS="tools/installers:containerd" +make sudo TARGETS="tools/installers:shim" # Run the tests that require root. install_runsc_for_test root |