Fixup jasmine2 to have more consistent CI runs

.circleci/config.yml

@@ -53,7 +53,7 @@ jobs:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: circleci/node:10.9.0-browsers
-    parallelism: 2
+    parallelism: 3
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -74,6 +74,18 @@ jobs:
           name: Run jasmine tests (batch 3)
           command: ./.circleci/test.sh jasmine3
 
+  test-jasmine4:
+    docker:
+      # need '-browsers' version to test in real (xvfb-wrapped) browsers
+      - image: circleci/node:10.9.0-browsers
+    working_directory: ~/plotly.js
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Run jasmine tests (batch 4)
+          command: ./.circleci/test.sh jasmine4
+
   test-image:
     docker:
       - image: plotly/testbed:latest
@@ -184,6 +196,9 @@ workflows:
       - test-jasmine3:
           requires:
             - build
+      - test-jasmine4:
+          requires:
+            - build
       - test-image:
           requires:
             - build

.circleci/test.sh

@@ -6,7 +6,7 @@ set +o pipefail
 
 ROOT=$(dirname $0)/..
 EXIT_STATE=0
-MAX_AUTO_RETRY=5
+MAX_AUTO_RETRY=1
 
 log () {
     echo -e "\n$1"
@@ -44,16 +44,20 @@ case $1 in
     jasmine)
         set_tz
 
+        MAX_AUTO_RETRY=10
+
         SUITE=$(circleci tests glob "$ROOT/test/jasmine/tests/*" | circleci tests split)
-        npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky --showSkipped || EXIT_STATE=$?
+        npm run test-jasmine -- $SUITE --skip-tags=dbgl,gl,noCI,flaky --showSkipped || EXIT_STATE=$?
 
         exit $EXIT_STATE
         ;;
 
     jasmine2)
         set_tz
 
-        SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
+        MAX_AUTO_RETRY=5
+
+        SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=gl | circleci tests split))
         for s in ${SHARDS[@]}; do
             retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --showSkipped
         done
@@ -64,6 +68,8 @@ case $1 in
     jasmine3)
         set_tz
 
+        MAX_AUTO_RETRY=5
+
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=flaky | circleci tests split))
 
         for s in ${SHARDS[@]}; do
@@ -73,6 +79,19 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
+    jasmine4)
+        set_tz
+
+        MAX_AUTO_RETRY=10
+
+        SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=dbgl | circleci tests split))
+        for s in ${SHARDS[@]}; do
+            retry npm run test-jasmine -- "$s" --tags=dbgl --skip-tags=noCI --showSkipped
+        done
+
+        exit $EXIT_STATE
+        ;;
+
     image)
         SUITE=$(find $ROOT/test/image/mocks/ -type f -printf "%f\n" | circleci tests split)
         npm run test-image -- $SUITE --filter || EXIT_STATE=$?

tasks/test_syntax.js

@@ -33,7 +33,7 @@ assertES5();
 // check for for focus and exclude jasmine blocks
 function assertJasmineSuites() {
     var BLACK_LIST = ['fdescribe', 'fit', 'xdescribe', 'xit'];
-    var TAGS = ['noCI', 'noCIdep', 'gl', 'flaky'];
+    var TAGS = ['noCI', 'noCIdep', 'gl', 'dbgl', 'flaky'];
     var IT_ONLY_TAGS = ['gl', 'flaky'];
     var logs = [];