Skip to content

Commit

Permalink
Remote docker and ubuntu upgrades (mozilla#7922)
Browse files Browse the repository at this point in the history
* Switch to docker24

* Switch to default Ubuntu image in circleCI

* Switch tox config from whitelist_externals to allowlist_externals
  • Loading branch information
Archaeopteryx committed Apr 26, 2024
1 parent 90ed2ae commit fdefeb8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
12 changes: 4 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,9 @@ jobs:

python-tests-mysql:
machine:
image: ubuntu-2004:202010-01
image: default
steps:
- checkout
- docker/install-docker:
version: 19.03.13
- docker/install-docker-compose:
version: 1.29.2
- run:
Expand All @@ -71,11 +69,9 @@ jobs:

python-tests-postgres:
machine:
image: ubuntu-2004:202010-01
image: default
steps:
- checkout
- docker/install-docker:
version: 19.03.13
- docker/install-docker-compose:
version: 1.29.2
- run:
Expand All @@ -94,7 +90,7 @@ jobs:
- image: docker:19.03.15
steps:
- setup_remote_docker:
version: 20.10.23
version: docker24
- checkout
- run:
name: Create a version.json
Expand All @@ -115,7 +111,7 @@ jobs:
- image: docker:19.03.15
steps:
- setup_remote_docker:
version: 20.10.23
version: docker24
- checkout
- run:
name: Create a version.json
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ skipsdist=True
toxworkdir={toxinidir}/.tox

[testenv]
whitelist_externals =
allowlist_externals =
sh
docker-compose
commands_pre =
Expand Down Expand Up @@ -43,14 +43,14 @@ commands_post =

[testenv:docker]
commands_pre =
whitelist_externals=
allowlist_externals=
docker-compose
commands =
docker-compose run -e TREEHERDER_DEBUG=False backend bash -c "pytest --cov --cov-report=xml tests/ --runslow -p no:unraisableexception"

[testenv:docker-postgres]
commands_pre =
whitelist_externals=
allowlist_externals=
docker-compose
commands =
docker-compose run -e TREEHERDER_DEBUG=False -e DATABASE_URL=psql://postgres:mozilla1234@postgres:5432/treeherder backend bash -c "pytest --cov --cov-report=xml tests/ --runslow -p no:unraisableexception"

0 comments on commit fdefeb8

Please sign in to comment.