Skip to content

Commit 04a3f7c

Browse files
dmcgowandmcgowan
committed
Update DEPLOY_DIR and VERSION to match installation script
Signed-off-by: Derek McGowan <[email protected]>
1 parent e4e05c6 commit 04a3f7c

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

‎cluster/gce‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../contrib/gce

‎test/build.sh‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,11 @@ cp releases/${latest}.sha256sum ${BUILDDIR}/${tarball}.sha256
4848

4949
# Push test tarball to Google cloud storage.
5050
VERSION=$(git describe --match 'v[0-9]*' --dirty='.m' --always)
51-
PUSH_VERSION=true DEPLOY_DIR='containerd' TARBALL=${tarball} VERSION=${VERSION} BUILD_DIR=${BUILDDIR} ${ROOT}/test/push.sh
51+
52+
if [ -z "${DEPLOY_DIR}" ]; then
53+
DEPLOY_DIR="containerd"
54+
else
55+
DEPLOY_DIR="containerd/${DEPLOY_DIR}"
56+
fi
57+
58+
PUSH_VERSION=true DEPLOY_DIR=${DEPLOY_DIR} TARBALL=${tarball} VERSION=${VERSION#v} BUILD_DIR=${BUILDDIR} ${ROOT}/test/push.sh

0 commit comments

Comments
 (0)