Merge pull request #2747 from appirio-tech/dev

Production Release 2.4.8
appirio-tech · Jan 15, 2019 · 4c28208 · 4c28208
2 parents 3964b3d + 52a089f
commit 4c28208
Show file tree

Hide file tree

Showing 32 changed files with 7,206 additions and 6,691 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,9 +4,6 @@ jobs:
     docker:
       - image: circleci/node:8.9.4-browsers
     steps:
-      - run:
-          name: checking out qa framework repo
-          command: git clone --branch develop https://$GITUSER:$GITPASSWD@github.com/appirio-tech/qa-framework-js.git ../qa-framework    
       - checkout
       - restore_cache:
           key: test-node-modules-{{ .Environment.CACHE_VERSION }}-{{ checksum "package-lock.json" }}
@@ -34,9 +31,9 @@ jobs:
       - deploy:
           name: Running MasterScript
           command: |
-            git clone --branch master https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+            git clone --branch v1.1 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
             cp ./../buildscript/master_deploy.sh .
-            ./master_deploy.sh -d CFRONT -e DEV -s connectapp
+            ./master_deploy.sh -d CFRONT -e DEV -s connectapp -c false
   # deploy to test02
   deployTest02:
     docker:
@@ -57,7 +54,7 @@ jobs:
       - deploy:
           name: Running MasterScript
           command: |
-            git clone --branch master https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+            git clone --branch v1.1 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
             cp ./../buildscript/master_deploy.sh .
             ./master_deploy.sh -d CFRONT -e PROD -s connectapp