Merge branch 'cassandra-3.11' into trunk

circle.yml

@@ -4,14 +4,15 @@ machine:
 
 test:
   pre:
-    - sudo ifconfig lo:1 127.0.0.2 up
-    - sudo ifconfig lo:2 127.0.0.3 up
-    - sudo ifconfig lo:3 127.0.0.4 up
-    - sudo ifconfig lo:4 127.0.0.5 up
-    - ant build
-
+    - sudo apt-get update; sudo apt-get install wamerican:
+        parallel: true
   override:
-    - ant test
+    - case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test ;; 1) ant long-test ;; 2) ant test-compression ;; 3) ant stress-test ;;esac:
+        parallel: true
+
   post:
-    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
-    - cp ./build/test/output/*.xml $CIRCLE_TEST_REPORTS/junit/
+    - mkdir -p $CIRCLE_TEST_REPORTS/junit/:
+        parallel: true
+    - find ./build/test/output/ -iname "*.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;:
+        parallel: true
+

doc/source/development/testing.rst

@@ -83,5 +83,8 @@ cstar_perf
 
 Another tool available on github is `cstar_perf <https://github.com/datastax/cstar_perf>`_ that can be used for intensive performance testing in large clusters or locally. Please refer to the project page on how to set it up and how to use it.
 
+CircleCI
+--------
+Cassandra ships with a default `CircleCI <https://circleci.com>`_ configuration, to enable running tests on your branches, you need to go the CircleCI website, click "Login" and log in with your github account. Then you need to give CircleCI permission to watch your repositories. Once you have done that, you can optionally configure CircleCI to run tests in parallel - click "Projects", then your github account and then click the settings for the project. If you leave the parallelism at 1 for Cassandra, only ``ant eclipse-warnings`` and ``ant test`` will be run. If you up the parallelism to 4, it also runs ``ant long-test``, ``ant test-compression`` and ``ant stress-test``