From bf5992e847bd52c53dc6a914f41afae9d65744d4 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Mon, 17 Feb 2020 16:42:32 -0500 Subject: [PATCH] Staging build: don't use _GIT_TAG The _GIT_TAG has a prefix vYYYYMMDD, so is not a valid semver. Instead we use our CI=1 approach to construct a reasonable semver tag. --- cloudbuild.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 5fc7f61e03..284caf82fc 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -8,7 +8,9 @@ steps: - name: 'gcr.io/k8s-testimages/bazelbuild:v20190916-ec59af8-0.29.1' entrypoint: make env: - - VERSION=$_GIT_TAG + # _GIT_TAG is not a valid semver, we use CI=1 instead + # - VERSION=$_GIT_TAG + - CI=1 - PULL_BASE_REF=$_PULL_BASE_REF - DOCKER_REGISTRY=$_DOCKER_REGISTRY - DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX @@ -17,7 +19,9 @@ steps: - name: 'gcr.io/k8s-testimages/bazelbuild:v20190916-ec59af8-0.29.1' entrypoint: make env: - - VERSION=$_GIT_TAG + # _GIT_TAG is not a valid semver, we use CI=1 instead + # - VERSION=$_GIT_TAG + - CI=1 - PULL_BASE_REF=$_PULL_BASE_REF - DOCKER_REGISTRY=$_DOCKER_REGISTRY - DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX