APPS-261 Put tags on the S3 test buckets

This commit is contained in:
Cezar.Leahu
2020-08-18 16:12:54 +03:00
parent 2540969052
commit ea775b9c88
4 changed files with 10 additions and 11 deletions

View File

@@ -68,7 +68,7 @@ jobs:
install: install:
- source scripts/setUpMavenPhase.sh - source scripts/setUpMavenPhase.sh
- bash scripts/create-worm-bucket.sh - bash scripts/create-worm-bucket.sh
before_script: before_script:
- travis_retry travis_wait 90 mvn -B -U install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am - travis_retry travis_wait 90 mvn -B -U install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am
script: script:
- travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} $MVN_SKIP -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} $MVN_SKIP -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn

View File

@@ -13,10 +13,10 @@ docker ps -a -q | xargs -l -r docker rm
pip install awscli pip install awscli
printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure
BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}" S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}"
S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" 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_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 aws s3 ls | awk '{print $3}' | grep "^${S3_BUCKET2_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force
popd popd

View File

@@ -21,6 +21,9 @@ aws s3api put-object-lock-configuration \
--bucket "${S3_BUCKET2_NAME}" \ --bucket "${S3_BUCKET2_NAME}" \
--object-lock-configuration '{ "ObjectLockEnabled": "Enabled", "Rule": { "DefaultRetention": { "Mode": "COMPLIANCE", "Days": 1 }}}' --object-lock-configuration '{ "ObjectLockEnabled": "Enabled", "Rule": { "DefaultRetention": { "Mode": "COMPLIANCE", "Days": 1 }}}'
aws s3api put-bucket-tagging --bucket "${S3_BUCKET2_NAME}" \
--tagging="TagSet=[{Key=toDeleteAfterTests,Value=true}]"
popd popd
set +vex set +vex
echo "=========================== Finishing Create Worm Bucket Script ==========================" echo "=========================== Finishing Create Worm Bucket Script =========================="

View File

@@ -2,22 +2,19 @@
export DOCKER_COMPOSE_PATH=$1 export DOCKER_COMPOSE_PATH=$1
if [ -z "$DOCKER_COMPOSE_PATH" ] if [ -z "$DOCKER_COMPOSE_PATH" ] ; then
then
echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\"" echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\""
exit 1 exit 1
fi fi
# Fix uppercase bucket name if set # Fix uppercase bucket name if set
if [ -n "${S3_BUCKET_NAME}" ] if [ -n "${S3_BUCKET_NAME}" ] ; then
then
export S3_BUCKET_NAME="${S3_BUCKET_NAME,,}" export S3_BUCKET_NAME="${S3_BUCKET_NAME,,}"
fi fi
export DOCKER_COMPOSE_PATH=$1 export DOCKER_COMPOSE_PATH=$1
if [ -z "$DOCKER_COMPOSE_PATH" ] if [ -z "$DOCKER_COMPOSE_PATH" ] ; then
then
echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\"" echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\""
exit 1 exit 1
fi fi
@@ -27,8 +24,7 @@ echo "Starting AGS stack in ${DOCKER_COMPOSE_PATH}"
# .env files are picked up from project directory correctly on docker-compose 1.23.0+ # .env files are picked up from project directory correctly on docker-compose 1.23.0+
docker-compose --file "${DOCKER_COMPOSE_PATH}" --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d docker-compose --file "${DOCKER_COMPOSE_PATH}" --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d
if [ $? -eq 0 ] if [ $? -eq 0 ] ; then
then
echo "Docker Compose started ok" echo "Docker Compose started ok"
else else
echo "Docker Compose failed to start" >&2 echo "Docker Compose failed to start" >&2