Update config.yml

Author: nkumar-topcoder

.circleci/config.yml

@@ -1,67 +1,70 @@
 version: 2
-
-jobs:
-  # Build & Deploy against development backend
-  "build-dev":
+defaults: &defaults
     docker:
       - image: docker:18.06.0-ce-git
-    steps:
-      # Initialization.
-      - checkout
-      - setup_remote_docker
-      - run:
-          name: Installation of build dependencies.
+install_dependency: &install_dependency
+          name: Installation of build and deployment dependencies.
           command: |
+            apk update
             apk add --no-cache bash
             apk add --no-cache jq py-pip sudo curl
+            apk upgrade
             pip install --upgrade pip
             sudo pip install awscli --upgrade
             sudo curl -o /usr/local/bin/ecs-cli https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-latest
             sudo pip install docker-compose
             sudo chmod +x /usr/local/bin/ecs-cli
-      - run:
-          name: Installation of build dependencies.
-          command: ./build.sh DEV
-      - deploy:
-          command: |
             
-            git clone --branch devsts https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+install_deploysuite: &install_deploysuite
+          name: Installation of install_deploysuite.
+          command: |
+            git clone --branch v1.3 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
             cp ./../buildscript/master_deploy.sh .
             cp ./../buildscript/buildenv.sh .
             cp ./../buildscript/awsconfiguration.sh .
+
+run_build: &run_build
+          name: Installation of build dependencies.
+          command: ./build.sh            
+
+jobs:
+  # Build & Deploy against development backend
+  "build-dev":
+    <<: *defaults
+      
+    steps:
+      # Initialization.
+      - checkout
+      - setup_remote_docker
+      - run: *install_dependency
+      - run: *install_deploysuite
+      - run: *run_build
+
+      - deploy:
+          command: |
             ./awsconfiguration.sh DEV
             source awsenvconf 
             ./buildenv.sh -e DEV -b submission-processor-es_deployvar
             source buildenvvar
-            ./master_deploy.sh -d ECS -e DEV -t latest -s submission-processor-es_appvar -i submission-processor-es
+            ./master_deploy.sh -d ECS -e DEV -t latest -s dev-global-appvar,submission-processor-es_appvar -i submission-processor-es
             
     
   "build-prod":
-    docker:
-      - image: docker:18.06.0-ce-git
+    <<: *defaults
     steps:
       # Initialization.
       - checkout
       - setup_remote_docker
-      - run:
-          name: Installation of build dependencies.
-          command: |
-            apk add --no-cache bash
-            apk add --no-cache jq py-pip sudo curl
-            pip install --upgrade pip
-            sudo pip install awscli --upgrade
-            sudo curl -o /usr/local/bin/ecs-cli https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-latest
-            sudo pip install docker-compose
-            sudo chmod +x /usr/local/bin/ecs-cli
-      - run:
-          name: Installation of build dependencies.
-          command: ./build.sh PROD
+      - run: *install_dependency  
+      - run: *install_deploysuite
+      - run: *run_build
       - deploy:
           command: |
-            git clone --branch v1.1 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
-            cp ./../buildscript/master_deploy.sh .
-            ./master_deploy.sh -d ECS -e PROD -t $CIRCLE_BUILD_NUM -s submission-processor-es  
-
+            ./awsconfiguration.sh PROD
+            source awsenvconf 
+            ./buildenv.sh -e PROD -b submission-processor-es_deployvar
+            source buildenvvar
+            ./master_deploy.sh -d ECS -e PROD -t latest -s prod-global-appvar,submission-processor-es_appvar -i submission-processor-es
 
 workflows:
   version: 2
@@ -74,6 +77,7 @@ workflows:
             branches:
               only: develop
       - "build-prod":
+          context : org-global
           filters:
             branches:
               only: master