Write all instance metadata to files.

Signed-off-by: Lantao Liu <lantaol@google.com>
containerd · Mar 17, 2018 · 1cf018f · 1cf018f
1 parent 916e99d
commit 1cf018f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/test/build-containerd.sh → test/containerd/build.sh b/test/build-containerd.sh → test/containerd/build.sh
@@ -22,7 +22,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-source $(dirname "${BASH_SOURCE[0]}")/build-utils.sh
+source $(dirname "${BASH_SOURCE[0]}")/../build-utils.sh
 cd "${ROOT}"
 
 if [ -z "${GOPATH}" ]; then

diff --git a/test/containerd/deploy-path b/test/containerd/deploy-path
@@ -0,0 +1 @@
+cri-containerd-staging/containerd
diff --git a/test/e2e_node/image-config-containerd.yaml → test/containerd/image-config.yaml b/test/e2e_node/image-config-containerd.yaml → test/containerd/image-config.yaml
@@ -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=containerd-cni,deploy-path=cri-containerd-staging/containerd"
+    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"
   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=containerd-cni,deploy-path=cri-containerd-staging/containerd"
+    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"
diff --git a/test/containerd/pkg-prefix b/test/containerd/pkg-prefix
@@ -0,0 +1 @@
+containerd-cni