Update GCE cluster bootstrapping and e2e test

Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 19:14:33 +00:00
parent 05bcc3e88c
commit 936dcceb5a
10 changed files with 143 additions and 219 deletions
--- a/test/build.sh
+++ b/test/build.sh
@@ -55,4 +55,4 @@ make clean
 DEPLOY_DIR=${DEPLOY_DIR:-""} make push
 # Build and push node e2e tarball.
 PUSH_VERSION=true DEPLOY_DIR=${DEPLOY_DIR:-""} \
-  make push TARBALL_PREFIX=cri-containerd-cni INCLUDE_CNI=true
+  make push TARBALL_PREFIX=cri-containerd-cni INCLUDE_CNI=true CUSTOM_CONTAINERD=true