Update DEPLOY_DIR and VERSION to match installation script

Signed-off-by: Derek McGowan <[email protected]>
sam-berning · Oct 16, 2020 · 04a3f7c · 04a3f7c
1 parent e4e05c6
commit 04a3f7c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/cluster/gce b/cluster/gce
@@ -0,0 +1 @@
+../contrib/gce
diff --git a/test/build.sh b/test/build.sh
@@ -48,4 +48,11 @@ cp releases/${latest}.sha256sum ${BUILDDIR}/${tarball}.sha256
 
 # Push test tarball to Google cloud storage.
 VERSION=$(git describe --match 'v[0-9]*' --dirty='.m' --always)
-PUSH_VERSION=true DEPLOY_DIR='containerd' TARBALL=${tarball} VERSION=${VERSION} BUILD_DIR=${BUILDDIR} ${ROOT}/test/push.sh
+
+if [ -z "${DEPLOY_DIR}" ]; then
+  DEPLOY_DIR="containerd"
+else
+  DEPLOY_DIR="containerd/${DEPLOY_DIR}"
+fi
+
+PUSH_VERSION=true DEPLOY_DIR=${DEPLOY_DIR} TARBALL=${tarball} VERSION=${VERSION#v} BUILD_DIR=${BUILDDIR} ${ROOT}/test/push.sh