From bee12c401dd6e35cd99f3e30eab0dbc26c203c6d Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Tue, 27 Oct 2020 10:53:12 +0200
Subject: [PATCH] - update the release command to push the docker images to
 quay and dockerhub

---
 .travis.yml        |  4 ++--
 scripts/release.sh | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7bab353be..e0de76312d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -262,7 +262,7 @@ jobs:
       stage: Publish
       if: commit_message =~ /\[community release .*\]/ AND commit_message =~ /\[publish\]/
       before_script: source scripts/set-release-variables.sh
-      script: travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -PbuildDockerImage -Prelease-community
+      script: skip
       before_deploy: bash scripts/zip-artifacts-release.sh "community"
       deploy:
         - provider: s3
@@ -283,7 +283,7 @@ jobs:
       stage: Publish
       if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/
       before_script: source scripts/set-release-variables.sh
-      script: travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -PbuildDockerImage -Prelease-enterprise
+      script: skip
       before_deploy: bash scripts/zip-artifacts-release.sh "enterprise"
       deploy:
         - provider: s3
diff --git a/scripts/release.sh b/scripts/release.sh
index ea5ee113de..600dd51deb 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -17,19 +17,19 @@ elif [ $release_type != "community" -a $release_type != "enterprise" ]; then
     exit 1
 fi
 
-# Check if it's a hotfix version by counting the number of dots in the version number.
-if [ `echo "${RELEASE_VERSION}" | grep -o "\." | wc -l` == 3 -a ${release_type} == "enterprise" ];
-then
-  deploymentRepository="hotfix-release"
-else
-  deploymentRepository="${release_type}-release"
-fi
-
 if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then
     echo "Please provide a Release and Development verison"
     exit 1
 fi
 
+# Check if it's a hotfix version by counting the number of dots in the version number.
+if [ `echo "${RELEASE_VERSION}" | grep -o "\." | wc -l` == 3 -a ${release_type} == "enterprise" ];
+then
+  deployment_repository="hotfix-release"
+else
+  deployment_repository="${release_type}-release"
+fi
+
 mvn --batch-mode \
     -Dusername="${GIT_USERNAME}" \
     -Dpassword="${GIT_PASSWORD}" \
@@ -37,4 +37,5 @@ mvn --batch-mode \
     -DdevelopmentVersion=${DEVELOPMENT_VERSION} \
     -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
     -DskipTests -D${release_type} -DuseReleaseProfile=false \
-    -P${deploymentRepository} release:clean release:prepare release:perform
\ No newline at end of file
+    -P${deployment_repository} -Prelease-${release_type} \
+    release:clean release:prepare release:perform
\ No newline at end of file