summaryrefslogtreecommitdiffhomepage
path: root/test/e2e/untrusted-workload/install.sh
diff options
context:
space:
mode:
authorIan Lewis <ianlewis@google.com>2020-03-25 08:28:24 +0900
committerGitHub <noreply@github.com>2020-03-25 08:28:24 +0900
commit8fbf811f79d611dd55355734736265dfec20b73f (patch)
tree1011bd93ba189f1bd64981940fcfc09f053b1a75 /test/e2e/untrusted-workload/install.sh
parentfa5f99187bb28a0f363ddce82cefe92a002edc0f (diff)
Updated e2e tests on travis (#53)
* Updated e2e tests on travis - Updated tests to run using Go 1.14 - Added test for containerd 1.3 - Updated release of runsc to test * Fix release downloading in e2e tests * Fix test targets * Update to using Ubuntu bionic in travis tests
Diffstat (limited to 'test/e2e/untrusted-workload/install.sh')
-rwxr-xr-xtest/e2e/untrusted-workload/install.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/e2e/untrusted-workload/install.sh b/test/e2e/untrusted-workload/install.sh
index cb11ab8d3..c4538aed1 100755
--- a/test/e2e/untrusted-workload/install.sh
+++ b/test/e2e/untrusted-workload/install.sh
@@ -11,6 +11,9 @@ disabled_plugins = ["restart"]
[plugins.linux]
shim = "/usr/local/bin/gvisor-containerd-shim"
shim_debug = true
+# Set to avoid port overlap on older versions of containerd where default is 10010.
+[plugins.cri]
+ stream_server_port = "10011"
[plugins.cri.containerd.untrusted_workload_runtime]
runtime_type = "io.containerd.runtime.v1.linux"
runtime_engine = "/usr/local/bin/runsc"
@@ -20,5 +23,5 @@ EOF
{ # Step 2: Restart containerd
sudo pkill containerd
-sudo containerd -log-level debug &> /tmp/containerd-cri.log &
+sudo containerd -log-level debug &>/tmp/containerd-cri.log &
}