Merge pull request #3725 from appirio-tech/dev

Connect Production Release 2.6 & 2.7

Author: RishiRajSahu

.circleci/config.yml

@@ -9,7 +9,7 @@ install_dependency: &install_dependency
           name: Installation of build and deployment dependencies.
           command: |
             sudo apt install python-dev python-pip -y
-            sudo pip install awscli --upgrade           
+            sudo pip install awscli --upgrade
 install_deploysuite: &install_deploysuite
           name: Installation of install_deploysuite.
           command: |
@@ -19,7 +19,7 @@ install_deploysuite: &install_deploysuite
             cp ./../buildscript/awsconfiguration.sh .
 restore_cache_settings_for_build: &restore_cache_settings_for_build
           key: connect-node-modules-{{ checksum "package-lock.json" }}
-save_cache_settings: &save_cache_settings    
+save_cache_settings: &save_cache_settings
           key: connect-node-modules-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
@@ -29,11 +29,11 @@ running_npm_build: &running_npm_build
             source buildenvvar
             npm run lint
             npm run test
-            npm run build  
+            npm run build
 workspace_persist: &workspace_persist
           root: .
           paths:
-            - dist 
+            - dist
 workspace_attach: &workspace_attach
           at: ./workspace
 
@@ -46,7 +46,7 @@ build_steps: &build_steps
       - restore_cache: *restore_cache_settings_for_build
       - run: npm install
       - save_cache: *save_cache_settings
-      - run: 
+      - run:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh $DEPLOY_ENV
@@ -57,15 +57,15 @@ build_steps: &build_steps
 deploy_steps: &deploy_steps
       - checkout
       - attach_workspace: *workspace_attach
-      - run: *install_deploysuite      
+      - run: *install_deploysuite
       - deploy:
           name: Running MasterScript
           command: |
             ./awsconfiguration.sh $DEPLOY_ENV
             source awsenvconf
             ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-connectapp-deployvar
             source buildenvvar
-            ./master_deploy.sh -d CFRONT -e $DEPLOY_ENV -c false
+            ./master_deploy.sh -d CFRONT -e $DEPLOY_ENV -c $ENABLE_CACHE
 
 jobs:
   build-dev:
@@ -88,20 +88,23 @@ jobs:
     environment:
       DEPLOY_ENV: "DEV"
       LOGICAL_ENV: "dev"
+      ENABLE_CACHE: false
     steps: *deploy_steps
 
   deployTest01:
     <<: *deploy_defaults
     environment:
       DEPLOY_ENV: "DEV"
       LOGICAL_ENV: "test01"
+      ENABLE_CACHE: false
     steps: *deploy_steps
 
   deployProd:
     <<: *deploy_defaults
     environment:
       DEPLOY_ENV: "PROD"
       LOGICAL_ENV: "prod"
+      ENABLE_CACHE: true
     steps: *deploy_steps
 
 workflows:
@@ -112,13 +115,13 @@ workflows:
           context : org-global
           filters:
             branches:
-              ignore: ['master']              
+              ignore: ['master']
       - build-prod:
           context : org-global
           filters:
             branches:
               only: master
-              
+
       - deployDev:
           context : org-global
           requires:
@@ -133,7 +136,7 @@ workflows:
             - build-dev
           filters:
             branches:
-              only: ['v5-upgrade']
+              only: ['v5-upgrade', 'feature/new-project-catalog']
 
       - deployProd:
           context : org-global