summaryrefslogtreecommitdiffhomepage
path: root/test/e2e/containerd-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/containerd-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/containerd-install.sh')
-rwxr-xr-xtest/e2e/containerd-install.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/test/e2e/containerd-install.sh b/test/e2e/containerd-install.sh
index 538b0ca2b..400819245 100755
--- a/test/e2e/containerd-install.sh
+++ b/test/e2e/containerd-install.sh
@@ -10,6 +10,13 @@ sudo mkdir -p /etc/containerd /etc/cni/net.d /opt/cni/bin
sudo tar -xvf cni-plugins-amd64-v0.7.0.tgz -C /opt/cni/bin/
sudo tar -xvf containerd-${CONTAINERD_VERSION}.linux-amd64.tar.gz -C /
+cat <<EOF | sudo tee /etc/containerd/config.toml
+disabled_plugins = ["restart"]
+# Set to avoid port overlap on older versions of containerd where default is 10010.
+[plugins.cri]
+ stream_server_port = "10011"
+EOF
+
cat <<EOF | sudo tee /etc/cni/net.d/10-bridge.conf
{
"cniVersion": "0.3.1",
@@ -34,5 +41,4 @@ cat <<EOF | sudo tee /etc/cni/net.d/99-loopback.conf
}
EOF
-sudo PATH=$PATH containerd -log-level debug &> /tmp/containerd-cri.log &
-
+sudo PATH=$PATH containerd -log-level debug &>/tmp/containerd-cri.log &