github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #675 from Random-Liu/fix-containerd-repo-test

Browse Source 
Fix containerd repo test.
This commit is contained in:
Lantao Liu 2018-03-16 16:43:53 -07:00 committed by GitHub
commit 916e99d0ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/build-containerd.sh
View File

@ -39,7 +39,7 @@ fi
# Make sure output directory is clean. # Make sure output directory is clean.
make clean make clean
# Build and push test tarball. # Build and push test tarball.
PUSH_VERSION=true DEPLOY_DIR=${DEPLOY_DIR:-""} \ PUSH_VERSION=true DEPLOY_DIR=cri-containerd-staging/containerd \
make push TARBALL_PREFIX=containerd-cni \ make push TARBALL_PREFIX=containerd-cni \
INCLUDE_CNI=true \ INCLUDE_CNI=true \
CHECKOUT_CONTAINERD=false \ CHECKOUT_CONTAINERD=false \

7
test/configure.sh
View File

@ -38,6 +38,13 @@ fetch_metadata() {
# DEPLOY_PATH is the gcs path where cri-containerd tarball is stored. # DEPLOY_PATH is the gcs path where cri-containerd tarball is stored.
DEPLOY_PATH=${DEPLOY_PATH:-"cri-containerd-staging"} DEPLOY_PATH=${DEPLOY_PATH:-"cri-containerd-staging"}
# DEPLOY_PATH_METADATA is the metadata key of DEPLOY_PATH.
DEPLOY_PATH_METADATA="deploy-path"
deploy_path=$(fetch_metadata "${DEPLOY_PATH_METADATA}")
if [ ! -z "${deploy_path}" ]; then
DEPLOY_PATH=${deploy_path}
fi
# PULL_REFS_METADATA is the metadata key of PULL_REFS from prow. # PULL_REFS_METADATA is the metadata key of PULL_REFS from prow.
PULL_REFS_METADATA="PULL_REFS" PULL_REFS_METADATA="PULL_REFS"
pull_refs=$(fetch_metadata "${PULL_REFS_METADATA}") pull_refs=$(fetch_metadata "${PULL_REFS_METADATA}")

4
test/e2e_node/image-config-containerd.yaml
View File

@ -2,8 +2,8 @@ images:
ubuntu: ubuntu:
image: ubuntu-gke-1604-xenial-v20170420-1 image: ubuntu-gke-1604-xenial-v20170420-1
project: ubuntu-os-gke-cloud project: ubuntu-os-gke-cloud
metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,pkg-prefix=containerd-cni" metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,pkg-prefix=containerd-cni,deploy-path=cri-containerd-staging/containerd"
cos-stable: cos-stable:
image_regex: cos-stable-60-9592-84-0 image_regex: cos-stable-60-9592-84-0
project: cos-cloud 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" 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"