diff --git a/.travis.yml b/.travis.yml index 5a8ebe0..6e9b25d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ deploy: skip_cleanup: true on: all_branches: true - condition: $TRAVIS_BRANCH =~ ^(dev|testing|demo|training|staging|master)$ + condition: $TRAVIS_BRANCH =~ ^(dev|testing|demo|training|staging|master|rrt\/.*)$ notifications: email: diff --git a/deploy.sh b/deploy.sh index eb95f96..f47ec5b 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,15 +1,38 @@ #!/bin/bash +function branch_to_tag () { + if [ "$1" == "latest" ]; then echo "production"; else echo "$1" ; fi +} + +function branch_to_deploy_group() { + if [[ $1 =~ ^(rrt\/.*)$ ]]; then echo "rrt"; else echo "crconnect" ; fi +} + +function branch_to_deploy_stage () { + if [ "$1" == "master" ]; then echo "production"; else echo "$1" ; fi +} + +REPO="sartography/cr-connect-db" +TAG=$(branch_to_tag "$TRAVIS_BRANCH") + +DEPLOY_APP="db" +DEPLOY_GROUP=$(branch_to_deploy_group "$TRAVIS_BRANCH") +DEPLOY_STAGE=$(branch_to_deploy_stage "$TRAVIS_BRANCH") + +if [ "$DEPLOY_GROUP" == "rrt" ]; then + IFS='/' read -ra ARR <<< "$TRAVIS_BRANCH" # Split branch on '/' character + TAG=$(branch_to_tag "rrt_${ARR[1]}") + DEPLOY_STAGE=$(branch_to_deploy_stage "${ARR[1]}") +fi + +DEPLOY_PATH="$DEPLOY_GROUP/$DEPLOY_STAGE/$DEPLOY_APP" +echo "REPO = $REPO" +echo "TAG = $TAG" +echo "DEPLOY_PATH = $DEPLOY_PATH" + # Build and push Docker image to Docker Hub echo "$DOCKER_TOKEN" | docker login -u "$DOCKER_USERNAME" --password-stdin || exit 1 -APP="db" -REPO="sartography/cr-connect-$APP" -TAG=$(if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo "$TRAVIS_BRANCH" ; fi) -COMMIT=${TRAVIS_COMMIT::8} - -docker build -f Dockerfile -t "$REPO:$COMMIT" . || exit 1 -docker tag "$REPO:$COMMIT" "$REPO:$TAG" || exit 1 -docker tag "$REPO:$COMMIT" "$REPO:travis-$TRAVIS_BUILD_NUMBER" || exit 1 +docker build -f Dockerfile -t "$REPO:$TAG" . || exit 1 docker push "$REPO" || exit 1 # Wait for Docker Hub @@ -18,4 +41,4 @@ sleep 30 # Notify UVA DCOS that Docker image has been updated echo "Refreshing DC/OS..." -aws sqs send-message --region "$AWS_DEFAULT_REGION" --queue-url "$AWS_SQS_URL" --message-body "crconnect/$TRAVIS_BRANCH/$APP" || exit 1 +aws sqs send-message --region "$AWS_DEFAULT_REGION" --queue-url "$AWS_SQS_URL" --message-body "$DEPLOY_PATH" || exit 1