From 1d228cbc384677fc5e11a5646e95637540ee363d Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Wed, 1 Nov 2017 01:31:21 +0000 Subject: [PATCH] Rename release tarball for node e2e to cri-containerd-cni. Signed-off-by: Lantao Liu --- .travis.yml | 4 ++-- test/e2e_node/build.sh | 2 +- test/e2e_node/configure.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5559a6a52..0654afa27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,6 +81,6 @@ jobs: script: - test "${TRAVIS_PULL_REQUEST}" != "false" && exit 0 || true - make push - # Build a tarball including CNI for node e2e. - - PUSH_VERSION=true make push TARBALL_PREFIX=cri-containerd-node-e2e INCLUDE_CNI=true + # Build a tarball including CNI. + - PUSH_VERSION=true make push TARBALL_PREFIX=cri-containerd-cni INCLUDE_CNI=true go: 1.8.x diff --git a/test/e2e_node/build.sh b/test/e2e_node/build.sh index e3d729e71..7adf8f04b 100755 --- a/test/e2e_node/build.sh +++ b/test/e2e_node/build.sh @@ -51,4 +51,4 @@ fi # Build and push node e2e tarball. PUSH_VERSION=true DEPLOY_DIR=${DEPLOY_DIR:-""} \ - make push TARBALL_PREFIX=cri-containerd-node-e2e INCLUDE_CNI=true + make push TARBALL_PREFIX=cri-containerd-cni INCLUDE_CNI=true diff --git a/test/e2e_node/configure.sh b/test/e2e_node/configure.sh index f96c160cb..517c9f5a1 100755 --- a/test/e2e_node/configure.sh +++ b/test/e2e_node/configure.sh @@ -43,7 +43,7 @@ fi VERSION=$(curl -f --ipv4 --retry 6 --retry-delay 3 --silent --show-error \ https://storage.googleapis.com/${DEPLOY_PATH}/latest) # TARBALL_GCS_PATH is the path to download cri-containerd tarball for node e2e. -TARBALL_GCS_PATH="https://storage.googleapis.com/${DEPLOY_PATH}/cri-containerd-node-e2e-${VERSION}.tar.gz" +TARBALL_GCS_PATH="https://storage.googleapis.com/${DEPLOY_PATH}/cri-containerd-cni-${VERSION}.tar.gz" # TARBALL is the name of the tarball after being downloaded. TARBALL="cri-containerd.tar.gz"