From e2d62026ee7926f0b67c39720376067c3b31a0d6 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 18:55:02 +0300 Subject: [PATCH] APPS-261 changes to scripts --- scripts/cleanup.sh | 7 +++---- scripts/worm-mb-tests.sh | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh index 83082b4df7..3589dad2eb 100644 --- a/scripts/cleanup.sh +++ b/scripts/cleanup.sh @@ -10,12 +10,11 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../" docker ps -a -q | xargs -l -r docker stop docker ps -a -q | xargs -l -r docker rm -sudo apt-get update -sudo apt-get install -q -y awscli +pip install awscli printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure -BUCKET_NAME="travis-ags-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}" -S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}-b2" +BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}" +S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" aws s3 ls | awk '{print $3}' | grep "^${BUCKET_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force aws s3 ls | awk '{print $3}' | grep "^${S3_BUCKET2_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index c58bf0d3a1..7c411976e0 100644 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -7,16 +7,15 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../" docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} -sudo apt-get update -sudo apt-get install -q -y awscli +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="eu-west-1" -export S3_BUCKET_NAME="travis-ags-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}" -export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}-b2" +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