From 73b4e933490f788a6f5edba924f3b9b914d00660 Mon Sep 17 00:00:00 2001
From: Marc Sluiter <msluiter@redhat.com>
Date: Mon, 12 Aug 2019 10:26:31 +0200
Subject: [PATCH] Fixed release process:

- fixed pushing of client-go by using a local branch name that is
different from the tag, they can't be the same (but TRAVIS_TAG and
TRAVIS_BRANCH are the same on a tag)
- moved pushing of CSV manifest after the github release, so it can't
break the release anymore.

Signed-off-by: Marc Sluiter <msluiter@redhat.com>
---
 .travis.yml             | 8 +++++++-
 hack/publish-staging.sh | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2f5143d8a7e8..a796af67b636 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,7 @@ deploy:
 - provider: script
   script: docker login -u="$DOCKER_USER" -p="$DOCKER_PASS" && DOCKER_PREFIX="index.docker.io/kubevirt"
     DOCKER_TAG="$TRAVIS_TAG" QUAY_REPOSITORY="kubevirt" PACKAGE_NAME="kubevirt-operatorhub"
-    sh -c 'make bazel-push-images && make manifests && make olm-push'
+    sh -c 'make bazel-push-images && make manifests'
   skip_cleanup: true
   file:
   on:
@@ -101,6 +101,12 @@ deploy:
   script: hack/publish-staging.sh
   on:
     branch: master
+- provider: script
+  script: DOCKER_TAG="$TRAVIS_TAG" QUAY_REPOSITORY="kubevirt" PACKAGE_NAME="kubevirt-operatorhub" make olm-push
+  skip_cleanup: true
+  file:
+  on:
+    tags: true
 
 env:
   global:
diff --git a/hack/publish-staging.sh b/hack/publish-staging.sh
index fa9310ffcb32..040a46673fe7 100755
--- a/hack/publish-staging.sh
+++ b/hack/publish-staging.sh
@@ -23,7 +23,7 @@ git clone \
     "https://${API_REFERENCE_PUSH_TOKEN}@${GITHUB_FQDN}/${API_REF_REPO}.git" \
     "${API_REF_DIR}" >/dev/null 2>&1
 pushd ${API_REF_DIR}
-git checkout -B ${TARGET_BRANCH}
+git checkout -B ${TARGET_BRANCH}-local
 git rm -rf .
 git clean -fxd
 popd