Improve gce bootstrapping in various ways.

Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2018-04-17 07:40:20 +00:00
parent 77a33b10a9
commit b2ebb735e7
15 changed files with 177 additions and 203 deletions

View File

@@ -1 +0,0 @@
cri-containerd-staging/containerd

3
test/containerd/env Normal file
View File

@@ -0,0 +1,3 @@
CONTAINERD_TEST: 'true'
CONTAINERD_DEPLOY_PATH: 'cri-containerd-staging/containerd'
CONTAINERD_PKG_PREFIX: 'containerd-cni'

View File

@@ -2,8 +2,8 @@ images:
ubuntu:
image: ubuntu-gke-1604-xenial-v20170420-1
project: ubuntu-os-gke-cloud
metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,pkg-prefix<test/containerd/pkg-prefix,deploy-path<test/containerd/deploy-path"
metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-env<test/containerd/env"
cos-stable:
image_regex: cos-stable-60-9592-84-0
project: cos-cloud
metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled,pkg-prefix<test/containerd/pkg-prefix,deploy-path<test/containerd/deploy-path"
metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<cluster/gce/configure.sh,containerd-extra-init-sh<test/e2e_node/gci-init.sh,containerd-env<test/containerd/env,gci-update-strategy=update_disabled"

View File

@@ -1 +0,0 @@
containerd-cni