Updates to CircleCI 2 configuration (#2774)

* Remove references to Gitter
* Move integration tests to their own workflow and run only on master branch
* Fix error in integration tests configuration
* Update names of stages

CONTRIBUTING.md

@@ -8,7 +8,6 @@ The following is a set of guidelines for contributing to Redash. These are guide
 
 - [Feature Roadmap](https://trello.com/b/b2LUHU7A/redash-roadmap)
 - [Feature Requests](https://discuss.redash.io/c/feature-requests)
-- [Gitter Chat](https://gitter.im/getredash/redash) or [Slack](https://slack.redash.io)
 - [Documentation](https://redash.io/help/)
 - [Blog](http://blog.redash.io/)
 - [Twitter](https://twitter.com/getredash)

README.md

@@ -5,7 +5,6 @@
     <img title="Build Status" src='https://circleci.com/gh/getredash/redash.png?circle-token=8a695aa5ec2cbfa89b48c275aea298318016f040'/>
 </p>
 
-[![Join the chat at https://gitter.im/getredash/redash](https://badges.gitter.im/getredash/redash.svg)](https://gitter.im/getredash/redash?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Documentation](https://img.shields.io/badge/docs-redash.io/help-brightgreen.svg)](https://redash.io/help/)
 
 **_Redash_** is our take on freeing the data within our company in a way that will better fit our culture and usage patterns.
@@ -41,7 +40,6 @@ Redash supports more than 25 [data sources](https://redash.io/help/data-sources/
 * Issues: https://github.com/getredash/redash/issues
 * Discussion Forum: https://discuss.redash.io/
 * Slack: http://slack.redash.io/
-* Gitter (chat): https://gitter.im/getredash/redash
 
 ## Reporting Bugs and Contributing Code
 

circle.yml

@@ -1,9 +1,6 @@
 version: 2.0
-notify:
-  webhooks:
-    - url: https://webhooks.gitter.im/e/895d09c3165a0913ac2f
 jobs:
-  build:
+  npm-build:
     docker:
       - image: circleci/node:8
     working_directory: ~/redash
@@ -27,7 +24,7 @@ jobs:
          key: node-modules-
          paths:
            - node_modules
-  unit_tests:
+  unit-tests:
     machine: true
     working_directory: ~/redash
     steps:
@@ -54,7 +51,7 @@ jobs:
           path: junit.xml
       - store_artifacts:
           path: coverage.xml
-  integration_tests:
+  integration-tests:
     working_directory: ~/redash
     machine: true
     environment:
@@ -63,14 +60,6 @@ jobs:
     steps:
       - attach_workspace:
           at: .
-      - run:
-          name: Check commit for running ui-tests
-          command:
-            UI_TESTS=$(git show -s --format=%s | grep -q -w '!run-ui-tests' && echo true || echo false)
-            if [[ $UI_TESTS != 'true' ]]; then
-              echo "Skipping Ui tests.";
-              circleci step halt
-            fi
       - run:
           name: Install Docker Compose
           command: |
@@ -82,7 +71,7 @@ jobs:
           name: Pull redash images
           command: |
             set -x
-            docker-compose -f docker-compose.yml up -d --no-start
+            docker-compose -f docker-compose.yml up --no-start
             sleep 10
       - run:
           name: Pull redash-ui-tests
@@ -104,7 +93,7 @@ jobs:
             docker run --net="host" --env REDASH_SERVER_URL="${REDASH_SERVER_URL}" "${DOCKER_IMAGE}"
       - store_artifacts:
           path: report.html
-  build-deploy: # build for master or release branches
+  build-tarball: # build for master or release branches
     docker:
       - image: circleci/node:8
     environment:
@@ -117,11 +106,11 @@ jobs:
       - attach_workspace:
           at: .
       - run:
-          name: Build
+          name: Pack Tarball
           command: bin/pack "$CIRCLE_BRANCH"
       - store_artifacts:
           path: $NAME.$FULL_VERSION.tar.gz
-  build-release: # build for tags
+  build-docker-image: # build for tags
     docker:
       - image: circleci/node:8
     working_directory: ~/redash
@@ -132,36 +121,37 @@ jobs:
           name: Tag deploy
           command: |
             set -x
-            bin/pack "$CIRCLE_TAG"
             docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
             docker build -t redash/redash:$(./manage.py version | sed -e "s/\+/./") .
             docker push redash/redash:$(./manage.py version | sed -e "s/\+/./")
 workflows:
   version: 2
-  build_test_deploy_release:
+  integration_tests:
     jobs:
-      - build-deploy:
+      - integration-tests:
+          filters:
+             branches:
+               only:
+                 - master
+  build:
+    jobs:
+      - npm-build
+      - unit-tests:
+          requires:
+            - npm-build
+      - build-tarball:
            requires:
-             - integration_tests
-             - unit_tests
+             - unit-tests
            filters:
              branches:
                only:
                  - master
                  - release
-      - build-release:
+      - build-docker-image:
            requires:
-             - integration_tests
-             - unit_tests
+             - unit-tests
            filters:
              tags:
                only: /v[0-9]+(\.[0-9\-a-z]+)*/
              branches:
                ignore: /.*/
-      - integration_tests:
-          requires:
-            - build
-      - unit_tests:
-          requires:
-            - build
-      - build