Merge branch 'master' into hotfix/new-flow-caas

Author: dmessing

.build-info

@@ -6,10 +6,10 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: test-node-modules-{{ checksum "package-lock.json" }}
+          key: test-node-modules-{{ .Environment.CACHE_VERSION }}-{{ checksum "package-lock.json" }}
       - run: npm install
       - save_cache:
-          key: test-node-modules-{{ checksum "package-lock.json" }}
+          key: test-node-modules-{{ .Environment.CACHE_VERSION }}-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
       - run: npm run lint
@@ -29,6 +29,15 @@ jobs:
       - attach_workspace:
           at: ./workspace
       - run: ./deploy.sh DEV no-cache
+  # deploy to test02
+  deployTest02:
+    docker:
+      - image: cibuilds/aws
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ./workspace
+      - run: ./deploy.sh TEST02 no-cache
 
   deployProd:
     docker:
@@ -39,6 +48,15 @@ jobs:
           at: ./workspace
       - run: ./deploy.sh PROD
 
+  deployDiscourseFree:
+    docker:
+      - image: cibuilds/aws
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ./workspace
+      - run: ./deploy.sh DISCOURSE
+
 workflows:
   version: 2
   build:
@@ -50,10 +68,21 @@ workflows:
           filters:
             branches:
               only: dev
+      - deployTest02:
+          requires:
+            - test
+          filters:
+            branches:
+              only: "feature/discourse-migration"
       - deployProd:
           requires:
             - test
           filters:
             branches:
               only: master
-            
+      - deployDiscourseFree:
+          requires:
+            - test
+          filters:
+            branches:
+              only: master-discourse-free

.circleci/config.yml

@@ -5,4 +5,5 @@ bower_components
 build
 dist
 npm-debug.log
-.history
+.history
+.build-info

.gitignore

@@ -12,7 +12,6 @@ module.exports = {
   AUTH0_CLIENT_ID   : process.env.AUTH0_CLIENT_ID_DEV,
   domain            : 'topcoder-dev.com',
   DOMAIN            : 'topcoder-dev.com',
-  CONNECT_MESSAGE_API_URL: process.env.CONNECT_MESSAGE_API_URL,
   ENV               : 'DEV',
 
   PROJECTS_API_URL  : 'https://api.topcoder-dev.com',
@@ -44,5 +43,7 @@ module.exports = {
   IBM_COGNITIVE_PROGRAM_ID  : 3449,
   HEAP_ANALYTICS_APP_ID     : '4153837120',
 
-  TC_NOTIFICATION_URL: 'https://api.topcoder-dev.com/v5/notifications'
+  TC_NOTIFICATION_URL: 'https://api.topcoder-dev.com/v5/notifications',
+  CONNECT_MESSAGE_API_URL: 'https://api.topcoder-dev.com/v5',
+  TC_SYSTEM_USERID: process.env.DEV_TC_SYSTEM_USERID
 }

config/constants/dev.js

@@ -1,6 +1,10 @@
 module.exports = (() => {
   const branch = process.env.CIRCLE_BRANCH || 'dev'
 
+  if(branch === 'master-discourse-free') {
+    return require('./master')
+  }
+
   // for security reason don't let to require any arbitrary file defined in process.env
   if (['master', 'qa'].indexOf(branch) < 0) {
     return require('./dev')

config/constants/index.js

@@ -43,5 +43,7 @@ module.exports = {
   IBM_COGNITIVE_PROGRAM_ID  : 3449,
   HEAP_ANALYTICS_APP_ID     : '638908330',
 
-  TC_NOTIFICATION_URL: 'https://api.topcoder.com/v5/notifications'
+  TC_NOTIFICATION_URL: 'https://api.topcoder.com/v5/notifications',
+  CONNECT_MESSAGE_API_URL: 'https://api.topcoder.com/v5',
+  TC_SYSTEM_USERID: process.env.PROD_TC_SYSTEM_USERID
 }

config/constants/master.js

@@ -42,5 +42,7 @@ module.exports = {
   IBM_COGNITIVE_PROGRAM_ID  : 3449,
   HEAP_ANALYTICS_APP_ID     : '4153837120',
 
-  TC_NOTIFICATION_URL: 'https://api.topcoder-dev.com/v5/notifications'
+  TC_NOTIFICATION_URL: 'https://api.topcoder-dev.com/v5/notifications',
+  CONNECT_MESSAGE_API_URL: 'https://api.topcoder-qa.com/v5',
+  TC_SYSTEM_USERID: process.env.QA_TC_SYSTEM_USERID
 }