Add tag calculation debugging

Signed-off-by: Nolan Brubaker <brubakern@vmware.com>

.travis.yml

@@ -27,5 +27,5 @@ deploy:
     skip_cleanup: true
     script: hack/gcr-push.sh
     on:
-      repo: vmware-tanzu/velero
+      repo: nrb/velero
       all_branches: true

Makefile

@@ -21,7 +21,7 @@ BIN ?= velero
 PKG := github.com/vmware-tanzu/velero
 
 # Where to push the docker image.
-REGISTRY ?= gcr.io/heptio-images
+REGISTRY ?= gcr.io/nolanb-vmware
 
 # Which architecture to build - see $(ALL_ARCH) for options.
 # if the 'local' rule is being run, detect the ARCH from 'go env'

hack/gcr-push.sh

@@ -36,18 +36,24 @@ function highest_release() {
     # As an example, if v1.3.0 exists and we create v1.2.2, v1.3.0 should still be `latest`.
     # `git describe --tags $(git rev-list --tags --max-count=1)` would return the most recently made tag.
 
+    echo "Showing all tags."
+    git tag -l --sort=-v:refname
+
     for t in $(git tag -l --sort=-v:refname);
     do
+        echo "Checking tag $t"
         # If the tag has alpha, beta or rc in it, it's not "latest"
         if [[ "$t" == *"beta"* || "$t" == *"alpha"* || "$t" == *"rc"* ]]; then
+            echo "Skipping tag $t"
             continue
         fi
+        echo "Found highest at $t"
         HIGHEST="$t"
         break
     done
 }
 
-if [ "$BRANCH" == "master" ]; then
+if [[ "$BRANCH" == "master" ]]; then
     VERSION="$BRANCH"
 elif [ ! -z "$TRAVIS_TAG" ]; then
     VERSION="$TRAVIS_TAG"
@@ -59,14 +65,18 @@ fi
 # Calculate the latest release
 highest_release
 
-# Assume we're not tagging `latest` by default.
+# Assume we're not tagging `latest` by default, and never on master.
 TAG_LATEST=false
-if [[ "$TRAVIS_TAG" == "$HIGHEST" ]]; then
+if [[ "$TRAVIS_TAG" == "$HIGHEST" && "$BRANCH" != "master" ]]; then
     TAG_LATEST=true
 fi
+echo "Highest tag found: $HIGHEST, BRANCH: $BRANCH, TRAVIS_TAG: $TRAVIS_TAG"
+echo "TAG_LATEST: $TAG_LATEST"
 
-openssl aes-256-cbc -K $encrypted_f58ab4413c21_key -iv $encrypted_f58ab4413c21_iv -in heptio-images-fac92d2303ac.json.enc -out heptio-images-fac92d2303ac.json -d
-gcloud auth activate-service-account --key-file heptio-images-fac92d2303ac.json
+# openssl aes-256-cbc -K $encrypted_f58ab4413c21_key -iv $encrypted_f58ab4413c21_iv -in heptio-images-fac92d2303ac.json.enc -out heptio-images-fac92d2303ac.json -d
+# gcloud auth activate-service-account --key-file heptio-images-fac92d2303ac.json
+openssl aes-256-cbc -K $encrypted_f58ab4413c21_key -iv $encrypted_f58ab4413c21_iv -in nolanb-vmware-55ce4993acec.json.enc -out nolanb-vmware-55ce4993acec.json -d
+gcloud auth activate-service-account --key-file nolanb-vmware-55ce4993acec.json
 gcloud auth configure-docker -q
 unset GIT_HTTP_USER_AGENT