Skip to content
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

Remote docker and ubuntu upgrades #7922

Merged
merged 3 commits into from
Mar 4, 2024
Merged

Remote docker and ubuntu upgrades #7922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e944cf
Switch to docker24
Archaeopteryx Mar 4, 2024
7cb3e39
Switch to default Ubuntu image in circleCI
Archaeopteryx Mar 4, 2024
9b749cd
Switch tox config from whitelist_externals to allowlist_externals
Archaeopteryx Mar 4, 2024
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
12 changes: 4 additions & 8 deletions .circleci/config.yml
View file
Open in desktop
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
View file
Open in desktop
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"