Unify publish-svc-cat scripts

.travis.yml

@@ -68,9 +68,9 @@ jobs:
       deploy:
         skip_cleanup: true
         provider: script
-        script: contrib/hack/ci/publish-svc-cat-release.sh --arch amd64
+        script: contrib/hack/ci/publish-svc-cat.sh --arch amd64
         on:
-          repo: kubernetes-sigs/service-catalog
+          repo: awalach-org/service-catalog
           all_branches: true
           condition: $DEPLOY_TYPE == release
     - stage: deploy
@@ -79,9 +79,9 @@ jobs:
       deploy:
         skip_cleanup: true
         provider: script
-        script: contrib/hack/ci/publish-svc-cat-release.sh --arch arm
+        script: contrib/hack/ci/publish-svc-cat.sh --arch arm
         on:
-          repo: kubernetes-sigs/service-catalog
+          repo: awalach-org/service-catalog
           all_branches: true
           condition: $DEPLOY_TYPE == release
     - stage: deploy
@@ -90,9 +90,9 @@ jobs:
       deploy:
         skip_cleanup: true
         provider: script
-        script: contrib/hack/ci/publish-svc-cat-release.sh --arch arm64
+        script: contrib/hack/ci/publish-svc-cat.sh --arch arm64
         on:
-          repo: kubernetes-sigs/service-catalog
+          repo: awalach-org/service-catalog
           all_branches: true
           condition: $DEPLOY_TYPE == release
     - stage: deploy
@@ -101,9 +101,9 @@ jobs:
       deploy:
         skip_cleanup: true
         provider: script
-        script: contrib/hack/ci/publish-svc-cat-release.sh --arch ppc64le
+        script: contrib/hack/ci/publish-svc-cat.sh --arch ppc64le
         on:
-          repo: kubernetes-sigs/service-catalog
+          repo: awalach-org/service-catalog
           all_branches: true
           condition: $DEPLOY_TYPE == release
     - stage: deploy
@@ -112,9 +112,9 @@ jobs:
       deploy:
         skip_cleanup: true
         provider: script
-        script: contrib/hack/ci/publish-svc-cat-release.sh --arch s390x
+        script: contrib/hack/ci/publish-svc-cat.sh --arch s390x
         on:
-          repo: kubernetes-sigs/service-catalog
+          repo: awalach-org/service-catalog
           all_branches: true
           condition: $DEPLOY_TYPE == release
     # Deploy service-catalog after merge to master
@@ -124,9 +124,9 @@ jobs:
       deploy:
         skip_cleanup: true
         provider: script
-        script: contrib/hack/ci/publish-svc-cat-master.sh
+        script: contrib/hack/ci/publish-svc-cat.sh
         on:
-          repo: kubernetes-sigs/service-catalog
+          repo: awalach-org/service-catalog
           all_branches: true
           condition: $DEPLOY_TYPE == master
     # Deploy svcat on release
@@ -138,7 +138,7 @@ jobs:
         provider: script
         script: contrib/hack/ci/publish-svcat-cli.sh
         on:
-          repo: kubernetes-sigs/service-catalog
+          repo: awalach-org/service-catalog
           all_branches: true
     - stage: push-chart
       script:

contrib/hack/ci/publish-svc-cat-release.sh → contrib/hack/ci/publish-svc-cat.sh

@@ -61,10 +61,16 @@ if [[ "$#" -ne 0 ]]; then
   set -- ${POSITIONAL[@]+"${POSITIONAL[@]}"}
 fi
 
-
 pushd ${REPO_ROOT_DIR}
 echo ${RELEASE_ARCH}
-shout "Pushing Service Catalog ${RELEASE_ARCH} images with tags '${TRAVIS_TAG}' and 'latest'."
-TAG_VERSION="${TRAVIS_TAG}" VERSION="${TRAVIS_TAG}" MUTABLE_TAG="latest" make release-push${RELEASE_ARCH}
+if [[ "${DEPLOY_TYPE}" == "release" ]]; then
+    shout "Pushing Service Catalog ${RELEASE_ARCH} images with tags '${TRAVIS_TAG}' and 'latest'."
+    TAG_VERSION="${TRAVIS_TAG}" VERSION="${TRAVIS_TAG}" MUTABLE_TAG="latest" make release-push${RELEASE_ARCH}
+elif [[ "${DEPLOY_TYPE}" == "master" ]]; then
+    shout "Pushing Service Catalog ${RELEASE_ARCH} images with default tags (git sha and 'canary')."
+    make push
+else
+    shout "Skip Service Catalog ${RELEASE_ARCH} deploy"
+fi
 
 popd