Merge branch 'staging' into features/identify-capgemini-volunteers

Author: MarkFarmiloe

.circleci/config.yml

@@ -43,6 +43,9 @@ jobs:
       - run:
           name: Set env variables
           command: echo 'export VERSION=$(echo $CIRCLE_SHA1 | cut -c -7)' >> $BASH_ENV
+      - run:
+          name: build qa
+          command: REACT_APP_NODE_ENV=QA yarn build:qa
       - run:
           name: build staging
           command: REACT_APP_NODE_ENV=STAGING yarn build:staging
@@ -52,15 +55,37 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
+            - qa
             - staging
             - production
 
+  deploy_qa:
+    docker:
+      - image: circleci/python:3.6-jessie
+    working_directory: ~/deploy
+    environment:
+      PUBLIC_URL: https://forms.qa.codeyourfuture.io
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: Set env variables
+          command: echo 'export VERSION=$(echo $CIRCLE_SHA1 | cut -c -7)' >> $BASH_ENV
+      - run:
+          name: Install awscli
+          command: sudo pip install awscli
+      - s3deploy:
+          dir: qa
+          to: 'forms.qa.codeyourfuture.io'
+          cf_distribution_id: E2VFUDC8YCDBKS
+
+
   deploy_staging:
     docker:
       - image: circleci/python:3.6-jessie
     working_directory: ~/deploy
     environment:
-      PUBLIC_URL: https://staging.forms.codeyourfuture.io
+      PUBLIC_URL: https://forms.staging.codeyourfuture.io
     steps:
       - attach_workspace:
           at: .
@@ -72,8 +97,8 @@ jobs:
           command: sudo pip install awscli
       - s3deploy:
           dir: staging
-          to: 'staging.forms.codeyourfuture.io'
-          cf_distribution_id: E3MJAA9E60TZUB
+          to: 'forms.staging.codeyourfuture.io'
+          cf_distribution_id: E1SJFMKKCNFUGI
 
   deploy_production:
     docker:
@@ -101,6 +126,14 @@ workflows:
     jobs:
       - build:
           context: build
+      - deploy_qa:
+          context: deployments_qa
+          requires:
+            - build
+          filters:
+            branches:
+              only:
+                - qa
       - deploy_staging:
           context: deployments_staging
           requires:

package.json

@@ -34,6 +34,7 @@
   "scripts": {
     "start": "REACT_APP_NODE_ENV=LOCAL react-scripts start",
     "build": "react-scripts build && yarn run delete-maps",
+    "build:qa": "REACT_APP_NODE_ENV=QA react-scripts build && yarn run delete-maps && mv build qa",
     "build:staging": "REACT_APP_NODE_ENV=STAGING react-scripts build && yarn run delete-maps && mv build staging",
     "build:production": "REACT_APP_NODE_ENV=PRODUCTION react-scripts build && yarn run delete-maps && mv build production",
     "delete-maps": "yarn run delete-map-files && yarn run delete-references-to-map-files",

src/config.js

@@ -5,6 +5,8 @@ export const domain = () => {
   switch (env) {
     case 'LOCAL':
       return 'http://localhost:3001'
+    case 'QA':
+      return 'https://cyf-api.qa.codeyourfuture.io'
     case 'STAGING':
       return 'https://cyf-api.staging.codeyourfuture.io'
     case 'PRODUCTION':