From 05d09edd121ac3dd846217542edfbcb0e095b8cd Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@stubailo.com>
Date: Thu, 14 Apr 2016 14:55:51 -0700
Subject: [PATCH] Change parallelism to 4 for tests

---
 scripts/ci.sh | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/scripts/ci.sh b/scripts/ci.sh
index c63566d183..8ef68e6324 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -2,38 +2,29 @@ export TIMEOUT_SCALE_FACTOR=15
 export TEST_PACKAGES_EXCLUDE="less"
 export SELF_TEST_EXCLUDE="^can't publish package with colons|^old cli tests|^logs - logged (in|out)|^mongo - logged (in|out)|^minifiers can't register non-js|^minifiers: apps can't use|^compiler plugins - addAssets"
 
+# Don't print as many progress indicators
+export EMACS=t
+
 # run different jobs based on CicleCI parallel container index
 case $CIRCLE_NODE_INDEX in
 0)
   echo "Running test-packages"
-  ./packages/test-in-console/run.sh
+  echo "Running self-test (1): A-Com"
+  ./packages/test-in-console/run.sh && ./meteor self-test --file "^[a-b]|^c[a-n]|^co[a-l]|^compiler-plugins" --exclude "$SELF_TEST_EXCLUDE"
   ;;
 1)
-  echo "Running self-test (1): A-Com"
-  ./meteor self-test --file "^[a-b]|^c[a-n]|^co[a-l]|^compiler-plugins" --exclude "$SELF_TEST_EXCLUDE"
+  echo "Running self-test (2): Con-K"
+  echo "Running self-test (3): L-O"
+  ./meteor self-test --file "^co[n-z]|^c[p-z]|^[d-k]" --exclude "$SELF_TEST_EXCLUDE" && ./meteor self-test --file "^[l-o]" --exclude "$SELF_TEST_EXCLUDE"
   ;;
 2)
-  echo "Running self-test (2): Con-K"
-  ./meteor self-test --file "^co[n-z]|^c[p-z]|^[d-k]" --exclude "$SELF_TEST_EXCLUDE"
+  echo "Running self-test (4): P"
+  echo "Running self-test (5): Run"
+  ./meteor self-test --file "^p" --exclude "$SELF_TEST_EXCLUDE"  && ./meteor self-test --file "^run" --exclude "$SELF_TEST_EXCLUDE"
   ;;
 3)
-  echo "Running self-test (3): L-O"
-  ./meteor self-test --file "^[l-o]" --exclude "$SELF_TEST_EXCLUDE"
-  ;;
-4)
-  echo "Running self-test (4): P"
-  ./meteor self-test --file "^p" --exclude "$SELF_TEST_EXCLUDE"
-  ;;
-5)
-  echo "Running self-test (5): Run"
-  ./meteor self-test --file "^run" --exclude "$SELF_TEST_EXCLUDE"
-  ;;
-6)
   echo "Running self-test (6): R-So"
-  ./meteor self-test --file "^r(?!un)|^s[a-o]" --exclude "$SELF_TEST_EXCLUDE"
-  ;;
-7)
   echo "Running self-test (7): Sp-Z"
-  ./meteor self-test --file "^s[p-z]|^[t-z]|^command-line" --exclude "$SELF_TEST_EXCLUDE"
+  ./meteor self-test --file "^r(?!un)|^s[a-o]" --exclude "$SELF_TEST_EXCLUDE" && ./meteor self-test --file "^s[p-z]|^[t-z]|^command-line" --exclude "$SELF_TEST_EXCLUDE"
   ;;
 esac