From 1fb181635741cdda5220b9bd13706d85645c9bf6 Mon Sep 17 00:00:00 2001
From: Claudia Agache <claudia.agache@ness.com>
Date: Thu, 20 Aug 2020 18:32:31 +0300
Subject: [PATCH] set env var globally

---
 scripts/create-worm-bucket.sh |  6 ------
 scripts/worm-mb-start-env.sh  | 12 +-----------
 travis-env-vars.yml           |  5 +++++
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/scripts/create-worm-bucket.sh b/scripts/create-worm-bucket.sh
index bb825d2f12..c3b44792df 100644
--- a/scripts/create-worm-bucket.sh
+++ b/scripts/create-worm-bucket.sh
@@ -8,12 +8,6 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../"
 pip install awscli
 printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure
 
-export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY}
-export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY}
-
-export S3_BUCKET_REGION="us-east-1"
-export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2"
-
 aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region ${S3_BUCKET_REGION} --object-lock-enabled-for-bucket
 aws s3api put-object-lock-configuration \
     --bucket "${S3_BUCKET2_NAME}" \
diff --git a/scripts/worm-mb-start-env.sh b/scripts/worm-mb-start-env.sh
index 3408d8e5f8..b6d6f77eb5 100644
--- a/scripts/worm-mb-start-env.sh
+++ b/scripts/worm-mb-start-env.sh
@@ -5,18 +5,8 @@ PS4="\[\e[35m\]+ \[\e[m\]"
 set -vex
 pushd "$(dirname "${BASH_SOURCE[0]}")/../"
 
-docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD}
 
-export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY}
-export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY}
-
-export S3_BUCKET_REGION="us-east-1"
-export S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}"
-export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2"
-export S3_PROTOCOL=s3v2
-export S3_BUCKET2_PROTOCOL=s3vTest
-
-bash scripts/start-compose.sh "${PWD}/rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml"
+bash scripts/start-compose.sh "${PWD}/${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml"
 
 popd
 set +vex
diff --git a/travis-env-vars.yml b/travis-env-vars.yml
index aa0e1f1190..5bf5599249 100644
--- a/travis-env-vars.yml
+++ b/travis-env-vars.yml
@@ -8,3 +8,8 @@ env:
     - ENTERPRISE_REPO_PATH=rm-enterprise/rm-enterprise-repo
     - ENTERPRISE_SHARE_PATH=rm-enterprise/rm-enterprise-share
     - MVN_SKIP='-Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests'
+    - AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY}
+    - AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY}
+    - S3_BUCKET_REGION="us-east-1"
+    - S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}"
+    - S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2"