8000 Merge pull request #5483 from plotly/user-friendly-container-name · plotly/plotly.js@7d3c8d3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7d3c8d3

Browse files
archmojarchmoj
authored
Merge pull request #5483 from plotly/user-friendly-container-name
Improve naming for test containers
2 parents dc3c342 + 5c11a30 commit 7d3c8d3

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎.circleci/config.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
paths:
4141
- plotly.js
4242

43-
test-jasmine:
43+
no-gl-test-jasmine:
4444
docker:
4545
# need '-browsers' version to test in real (xvfb-wrapped) browsers
4646
- image: circleci/node:12.13.0-browsers
@@ -50,10 +50,10 @@ jobs:
5050
- attach_workspace:
5151
at: ~/
5252
- run:
53-
name: Run jasmine tests (batch 1)
54-
command: ./.circleci/test.sh jasmine
53+
name: Run jasmine tests (part A)
54+
command: ./.circleci/test.sh no-gl-jasmine
5555

56-
test-jasmine2:
56+
webgl-test-jasmine:
5757
docker:
5858
# need '-browsers' version to test in real (xvfb-wrapped) browsers
5959
- image: circleci/node:12.13.0-browsers
@@ -63,10 +63,10 @@ jobs:
6363
- attach_workspace:
6464
at: ~/
6565
- run:
66-
name: Run jasmine tests (batch 2)
67-
command: ./.circleci/test.sh jasmine2
66+
name: Run jasmine tests (part B)
67+
command: ./.circleci/test.sh webgl-jasmine
6868

69-
test-jasmine3:
69+
no-gl-flaky-test-jasmine:
7070
docker:
7171
# need '-browsers' version to test in real (xvfb-wrapped) browsers
7272
- image: circleci/node:12.13.0-browsers
@@ -75,8 +75,8 @@ jobs:
7575
- attach_workspace:
7676
at: ~/
7777
- run:
78-
name: Run jasmine tests (batch 3)
79-
command: ./.circleci/test.sh jasmine3
78+
name: Run jasmine tests (part C)
79+
command: ./.circleci/test.sh no-gl-flaky-jasmine
8080

8181
test-image:
8282
docker:
@@ -92,13 +92,13 @@ jobs:
9292
supervisord &
9393
npm run docker -- setup
9494
- run:
95-
name: Run image tests
95+
name: Run image tests (part A)
9696
command: ./.circleci/test.sh image
9797
- store_artifacts:
9898
path: build
9999
destination: /
100100

101-
test-image2:
101+
flaky-test-image:
102102
docker:
103103
- image: plotly/testbed:latest
104104
working_directory: /var/www/streambed/image_server/plotly.js/
@@ -111,8 +111,8 @@ jobs:
111111
supervisord &
112112
npm run docker -- setup
113113
- run:
114-
name: Run image tests
115-
command: ./.circleci/test.sh image2
114+
name: Run image tests (part B)
115+
command: ./.circleci/test.sh flaky-image
116116
- store_artifacts:
117117
path: build
118118
destination: /
@@ -191,19 +191,19 @@ workflows:
191191
- test-bundle:
192192
requires:
193193
- build
194-
- test-jasmine:
194+
- no-gl-test-jasmine:
195195
requires:
196196
- build
197-
- test-jasmine2:
197+
- webgl-test-jasmine:
198198
requires:
199199
- build
200-
- test-jasmine3:
200+
- no-gl-flaky-test-jasmine:
201201
requires:
202202
- build
203203
- test-image:
204204
requires:
205205
- build
206-
- test-image2:
206+
- flaky-test-image:
207207
requires:
208208
- build
209209
- test-syntax:

‎.circleci/test.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ set_tz () {
4141

4242
case $1 in
4343

44-
jasmine)
44+
no-gl-jasmine)
4545
set_tz
4646

4747
SUITE=$(circleci tests glob "$ROOT/test/jasmine/tests/*" | circleci tests split)
@@ -50,7 +50,7 @@ case $1 in
5050
exit $EXIT_STATE
5151
;;
5252

53-
jasmine2)
53+
webgl-jasmine)
5454
set_tz
5555

5656
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
@@ -62,7 +62,7 @@ case $1 in
6262
exit $EXIT_STATE
6363
;;
6464

65-
jasmine3)
65+
no-gl-flaky-jasmine)
6666
set_tz
6767

6868
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=flaky | circleci tests split))
@@ -81,7 +81,7 @@ case $1 in
8181
exit $EXIT_STATE
8282
;;
8383

84-
image2)
84+
flaky-image)
8585
MAX_AUTO_RETRY=5
8686
retry npm run test-image -- --just-flaky
8787
npm run test-export || EXIT_STATE=$?

0 commit comments

Comments
 (0)
0