From 8fbf811f79d611dd55355734736265dfec20b73f Mon Sep 17 00:00:00 2001
From: Ian Lewis <ianlewis@google.com>
Date: Wed, 25 Mar 2020 08:28:24 +0900
Subject: 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
---
 test/e2e/containerd-install.sh         | 10 ++++++++--
 test/e2e/runsc-install.sh              |  2 +-
 test/e2e/untrusted-workload/install.sh |  5 ++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'test')

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 &
diff --git a/test/e2e/runsc-install.sh b/test/e2e/runsc-install.sh
index 64823bd3b..420fe01e9 100755
--- a/test/e2e/runsc-install.sh
+++ b/test/e2e/runsc-install.sh
@@ -3,6 +3,6 @@
 # Sample script to install runsc
 
 wget -q --https-only \
-    https://storage.googleapis.com/gvisor/releases/nightly/${RUNSC_VERSION}/runsc
+    https://storage.googleapis.com/gvisor/releases/${RUNSC_VERSION}/runsc
 chmod +x runsc
 sudo mv runsc /usr/local/bin/
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 &
 }
-- 
cgit v1.2.3