From 04a3f7c499635db4c01dc1d8e2df79fe71968ffe Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Tue, 13 Oct 2020 14:32:07 -0700
Subject: [PATCH] Update DEPLOY_DIR and VERSION to match installation script

Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 cluster/gce   | 1 +
 test/build.sh | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 120000 cluster/gce

diff --git a/cluster/gce b/cluster/gce
new file mode 120000
index 000000000000..499fb0a09c7c
--- /dev/null
+++ b/cluster/gce
@@ -0,0 +1 @@
+../contrib/gce
\ No newline at end of file
diff --git a/test/build.sh b/test/build.sh
index d8a84f3594cb..61578f5543f0 100755
--- 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