Merge pull request #10382 from jzoldak/zoldak/adjust-circle-parallelism

Adjust circleCI config for parallelism

scripts/circle-ci-tests.sh

@@ -31,7 +31,22 @@ export NO_PREREQ_INSTALL='true'
 
 EXIT=0
 
-case $CIRCLE_NODE_INDEX in
+if [ "$CIRCLE_NODE_TOTAL" == "1" ] ; then
+    echo "Only 1 container is being used to run the tests."
+    echo "To run in more containers, configure parallelism for this repo's settings "
+    echo "via the CircleCI UI and adjust scripts/circle-ci-tests.sh to match."
+
+    echo "Running tests for common/lib/ and pavelib/"
+    paver test_lib --extra_args="--with-flaky" --cov_args="-p" || EXIT=1
+    echo "Running python tests for Studio"
+    paver test_system -s cms --extra_args="--with-flaky" --cov_args="-p" || EXIT=1
+    echo "Running python tests for lms"
+    paver test_system -s lms --extra_args="--with-flaky" --cov_args="-p" || EXIT=1
+
+    exit $EXIT
+else
+    # Split up the tests to run in parallel on 4 containers
+    case $CIRCLE_NODE_INDEX in
         0)  # run the quality metrics
             echo "Finding fixme's and storing report..."
             paver find_fixme > fixme.log || { cat fixme.log; EXIT=1; }
@@ -75,4 +90,5 @@ case $CIRCLE_NODE_INDEX in
             echo "Please adjust scripts/circle-ci-tests.sh to match your parallelism."
             exit 1
             ;;
-esac
+    esac
+fi