From 5c11a30b00a524e6173c09398662d649a3d963a1 Mon Sep 17 00:00:00 2001
From: archmoj <mojtaba@plot.ly>
Date: Mon, 8 Feb 2021 22:52:30 -0500
Subject: [PATCH] improve naming for test containers

---
 .circleci/config.yml | 34 +++++++++++++++++-----------------
 .circleci/test.sh    |  8 ++++----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d68fd96f1c8..11976115b6c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,7 @@ jobs:
           paths:
             - plotly.js
 
-  test-jasmine:
+  no-gl-test-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: circleci/node:12.13.0-browsers
@@ -50,10 +50,10 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          name: Run jasmine tests (batch 1)
-          command: ./.circleci/test.sh jasmine
+          name: Run jasmine tests (part A)
+          command: ./.circleci/test.sh no-gl-jasmine
 
-  test-jasmine2:
+  webgl-test-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: circleci/node:12.13.0-browsers
@@ -63,10 +63,10 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          name: Run jasmine tests (batch 2)
-          command: ./.circleci/test.sh jasmine2
+          name: Run jasmine tests (part B)
+          command: ./.circleci/test.sh webgl-jasmine
 
-  test-jasmine3:
+  no-gl-flaky-test-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: circleci/node:12.13.0-browsers
@@ -75,8 +75,8 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          name: Run jasmine tests (batch 3)
-          command: ./.circleci/test.sh jasmine3
+          name: Run jasmine tests (part C)
+          command: ./.circleci/test.sh no-gl-flaky-jasmine
 
   test-image:
     docker:
@@ -92,13 +92,13 @@ jobs:
             supervisord &
             npm run docker -- setup
       - run:
-          name: Run image tests
+          name: Run image tests (part A)
           command: ./.circleci/test.sh image
       - store_artifacts:
           path: build
           destination: /
 
-  test-image2:
+  flaky-test-image:
     docker:
       - image: plotly/testbed:latest
     working_directory: /var/www/streambed/image_server/plotly.js/
@@ -111,8 +111,8 @@ jobs:
             supervisord &
             npm run docker -- setup
       - run:
-          name: Run image tests
-          command: ./.circleci/test.sh image2
+          name: Run image tests (part B)
+          command: ./.circleci/test.sh flaky-image
       - store_artifacts:
           path: build
           destination: /
@@ -191,19 +191,19 @@ workflows:
       - test-bundle:
           requires:
             - build
-      - test-jasmine:
+      - no-gl-test-jasmine:
           requires:
             - build
-      - test-jasmine2:
+      - webgl-test-jasmine:
           requires:
             - build
-      - test-jasmine3:
+      - no-gl-flaky-test-jasmine:
           requires:
             - build
       - test-image:
           requires:
             - build
-      - test-image2:
+      - flaky-test-image:
           requires:
             - build
       - test-syntax:
diff --git a/.circleci/test.sh b/.circleci/test.sh
index 3c59591179f..459c23dd210 100755
--- a/.circleci/test.sh
+++ b/.circleci/test.sh
@@ -41,7 +41,7 @@ set_tz () {
 
 case $1 in
 
-    jasmine)
+    no-gl-jasmine)
         set_tz
 
         SUITE=$(circleci tests glob "$ROOT/test/jasmine/tests/*" | circleci tests split)
@@ -50,7 +50,7 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
-    jasmine2)
+    webgl-jasmine)
         set_tz
 
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
@@ -62,7 +62,7 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
-    jasmine3)
+    no-gl-flaky-jasmine)
         set_tz
 
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=flaky | circleci tests split))
@@ -81,7 +81,7 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
-    image2)
+    flaky-image)
         MAX_AUTO_RETRY=5
         retry npm run test-image -- --just-flaky
         npm run test-export     || EXIT_STATE=$?