Skip to content

Improve naming for test containers #5483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 9, 2021
Merged

Improve naming for test containers #5483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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/
Expand All @@ -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: /
Expand Down Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .circleci/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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))
Expand All @@ -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))
Expand All @@ -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=$?
Expand Down