Merge remote-tracking branch 'origin/testing' into feature/not_sure

.travis.yml

@@ -27,7 +27,7 @@ deploy:
   skip_cleanup: true
   on:
     all_branches: true
-    condition: $TRAVIS_BRANCH =~ ^(testing|staging|master)$
+    condition: $TRAVIS_BRANCH =~ ^(dev|testing|demo|training|staging|master|rrt\/.*)$
 
 notifications:
   email:

config/default.py

@@ -4,6 +4,7 @@ from os import environ
 basedir = os.path.abspath(os.path.dirname(__file__))
 
 NAME = "CR Connect Protocol Builder Mock"
+FLASK_PORT = environ.get('PORT0') or environ.get('FLASK_PORT', default="5001")
 CORS_ENABLED = False
 DEVELOPMENT = environ.get('DEVELOPMENT', default="true") == "true"
 TESTING = environ.get('TESTING', default="false") == "true"

deploy.sh

@@ -1,22 +1,44 @@
 #!/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/protocol-builder-mock"
+TAG=$(branch_to_tag "$TRAVIS_BRANCH")
+
+DEPLOY_APP="protocol-builder-mock"
+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
-REPO="sartography/protocol-builder-mock"
-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
 echo "Publishing to Docker Hub..."
 sleep 30
 
-# Notify DC/OS that Docker image has been updated
+# Notify UVA DCOS that Docker image has been updated
 echo "Refreshing DC/OS..."
-STAGE=$(if [ "$TRAVIS_BRANCH" == "master" ]; then echo "production"; else echo "$TRAVIS_BRANCH" ; fi)
-echo "STAGE = $STAGE"
-aws sqs send-message --region "$AWS_DEFAULT_REGION" --queue-url "$AWS_SQS_URL" --message-body "crconnect/$STAGE/protocol-builder-mock" || exit 1
+aws sqs send-message --region "$AWS_DEFAULT_REGION" --queue-url "$AWS_SQS_URL" --message-body "$DEPLOY_PATH" || exit 1

run.py

@@ -1,3 +1,4 @@
 from app import app
 if __name__ == "__main__":
-    app.run(host='0.0.0.0', port=5001)
+    flask_port = app.config['FLASK_PORT']
+    app.run(host='0.0.0.0', port=flask_port)