From df03bfaef9b63e0150e3f410fd46e168538b7015 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 19 Oct 2020 13:42:15 +0300
Subject: [PATCH] Update release script  [skip tests] [internal enterprise
 release 2.7.3-A1 2.7.3-SNAPSHOT]

---
 .travis.yml                      | 45 ++++++++++++++++----------------
 scripts/release.sh               |  7 ++---
 scripts/set-release-variables.sh |  3 ++-
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c7198c571c..dc6a07f087 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -109,25 +109,26 @@ jobs:
        - echo "Static Analysis (SAST)"
 
     - name: "Release"
-        stage: Release and Publish
-        if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ ^\[.*release.*\]$
-        before_script:
-          bash scripts/set-release-variables.sh
-        script:
-          - bash scripts/release.sh ${RELEASE_TYPE}
-        before_deploy:
-          - bash scripts/zip-artifacts.sh ${RELEASE_TYPE}
-        deploy:
-          - provider: s3
-            access_key_id: ${ARTIFACTS_KEY}
-            secret_access_key: ${ARTIFACTS_SECRET}
-            region: "eu-west-1"
-            bucket: ${ARTIFACTS_UPLOAD_BUCKET}
-            upload_dir: ${ARTIFACTS_UPLOAD_DIR}
-            skip_cleanup: true
-            acl: private
-            local_dir: artifacts_dir
-            on:
-              all_branches: true
-          after_deploy:
-            - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}"
\ No newline at end of file
+      stage: Release and Publish
+      if: fork = false AND (branch = master OR branch =~ /release\/.*/ OR branch =~ /merge-2.7\/.*/) AND type != pull_request AND commit_message =~ /.*\[.*release.*\].*/
+      before_script:
+        - echo ${TRAVIS_COMMIT_MESSAGE}
+        - source scripts/set-release-variables.sh
+      script:
+        - bash scripts/release.sh ${RELEASE_TYPE}
+      before_deploy:
+        - bash scripts/zip-artifacts.sh ${RELEASE_TYPE}
+      deploy:
+        - provider: s3
+          access_key_id: ${ARTIFACTS_KEY}
+          secret_access_key: ${ARTIFACTS_SECRET}
+          region: "eu-west-1"
+          bucket: ${ARTIFACTS_UPLOAD_BUCKET}
+          upload_dir: ${ARTIFACTS_UPLOAD_DIR}
+          skip_cleanup: true
+          acl: private
+          local_dir: artifacts_dir
+          on:
+            all_branches: true
+      after_deploy:
+        - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}"
\ No newline at end of file
diff --git a/scripts/release.sh b/scripts/release.sh
index 77ede07469..499765aeee 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -8,6 +8,7 @@ git config user.email "${GIT_COMMITTER_EMAIL}"
 git config user.name "${GIT_COMMITTER_NAME}"
 
 release_type=$1
+echo Release type: "$release_type"
 
 if [ -z $release_type ]; then
     echo "Please provide a release type."
@@ -21,11 +22,11 @@ if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ];
     then echo "Please provide a Release and Development verison"
          exit 1
 else
-    mvn --batch-mode
+    mvn --batch-mode \
     -Dusername="${GITHUB_USERNAME}" \
-    -Dpassword="${GITHUB_PASSWORD}" \
+    -Dpassword="${GITHUB_API_TOKEN}" \
     -DreleaseVersion=${RELEASE_VERSION} \
     -DdevelopmentVersion=${DEVELOPMENT_VERSION} \
     -DskipTests -D${release_type} -DuseReleaseProfile=false \
-    -Prelease-${release_type} release:clean release:prepare release:perform
+    -P${release_type}-release release:clean release:prepare release:perform
 fi
diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 56dfbb680e..0f18168c50 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '\[(internal )*(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\]')
+echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
+release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(internal )*(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."