From 07e2bc3f1a16b0272375ba6dbf12fb85334b4f24 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Wed, 21 Oct 2020 12:17:25 +0300
Subject: [PATCH] APPS-241: Update release and staging buckets access
 credentials - remove -v flag from scripts [enterprise release 2.7.3-A4
 2.7.3-SNAPSHOT] [skip tests]

---
 .travis.yml                      | 18 +++++++++---------
 scripts/release.sh               |  2 +-
 scripts/set-release-variables.sh |  2 +-
 scripts/zip-artifacts-release.sh |  2 +-
 scripts/zip-artifacts-staging.sh |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f9eba90c3d..63483d490c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,8 +122,8 @@ jobs:
         - bash scripts/zip-artifacts-staging.sh "community"
       deploy:
         - provider: s3
-          access_key_id: ${ARTIFACTS_KEY}
-          secret_access_key: ${ARTIFACTS_SECRET}
+          access_key_id: ${STAGING_AWS_ACCESS_KEY}
+          secret_access_key: ${STAGING_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "alfresco-artefacts-staging"
           upload_dir: "community/RM/${RELEASE_VERSION}"
@@ -146,8 +146,8 @@ jobs:
         - bash scripts/zip-artifacts-staging.sh "enterprise"
       deploy:
         - provider: s3
-          access_key_id: ${ARTIFACTS_KEY}
-          secret_access_key: ${ARTIFACTS_SECRET}
+          access_key_id: ${STAGING_AWS_ACCESS_KEY}
+          secret_access_key: ${STAGING_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "alfresco-artefacts-staging"
           upload_dir: "enterprise/RM/${RELEASE_VERSION}"
@@ -167,8 +167,8 @@ jobs:
       before_deploy: bash scripts/zip-artifacts-release.sh "community"
       deploy:
         - provider: s3
-          access_key_id: ${ARTIFACTS_KEY}
-          secret_access_key: ${ARTIFACTS_SECRET}
+          access_key_id: ${RELEASE_AWS_ACCESS_KEY}
+          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -180,7 +180,7 @@ jobs:
       after_deploy:
         - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/${ARTIFACTS_UPLOAD_BUCKET}/${ARTIFACTS_UPLOAD_DIR}"
 
-    - name: "Enterprise Publish to S3 Staging Bucket"
+    - name: "Enterprise Publish to S3 Release Bucket"
       stage: Publish
       if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/
       before_script: source scripts/set-release-variables.sh
@@ -188,8 +188,8 @@ jobs:
       before_deploy: bash scripts/zip-artifacts-release.sh "enterprise"
       deploy:
         - provider: s3
-          access_key_id: ${ARTIFACTS_KEY}
-          secret_access_key: ${ARTIFACTS_SECRET}
+          access_key_id: ${RELEASE_AWS_ACCESS_KEY}
+          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"
diff --git a/scripts/release.sh b/scripts/release.sh
index 1436d0c8e8..e49e7bc202 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -ev
+set -e
 
 # Use full history for release
 git checkout -B "${TRAVIS_BRANCH}"
diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 44cce71321..35013b7053 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -ev
+set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
 release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
diff --git a/scripts/zip-artifacts-release.sh b/scripts/zip-artifacts-release.sh
index 41ea2c8d5e..81d272a4ca 100644
--- a/scripts/zip-artifacts-release.sh
+++ b/scripts/zip-artifacts-release.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -ev
+set -e
 
 release_type=$1
 
diff --git a/scripts/zip-artifacts-staging.sh b/scripts/zip-artifacts-staging.sh
index 11bf97cc06..bada0395ae 100755
--- a/scripts/zip-artifacts-staging.sh
+++ b/scripts/zip-artifacts-staging.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -ev
+set -e
 
 release_type=$1