Merge pull request kubevirt#2616 from kubevirt-bot/cherry-pick-2592-t…

…o-release-0.20 [release-0.20] Fixed release process
tiraboschi · Aug 20, 2019 · eb1308c · eb1308c
2 parents 66b9b3e + 73b4e93
commit eb1308c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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