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

Fix #742: Update integration tests to use recent basket image #994

Merged
merged 1 commit into from
Oct 29, 2024
Merged

Fix #742: Update integration tests to use recent basket image #994

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
11 changes: 5 additions & 6 deletions docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ services:
- 8080:8080
basket:
profiles: [integration-test]
image: mozmeao/basket:2023-04-24
image: mozmeao/basket:2024-10-21
env_file:
- ./tests/integration/basket.env
command:
Expand All @@ -66,7 +66,7 @@ services:
retries: 10
basket-worker:
profiles: [integration-test]
image: mozmeao/basket:2023-04-24
image: mozmeao/basket:2024-10-21
env_file:
- ./tests/integration/basket.env
command:
Expand All @@ -79,11 +79,10 @@ services:
web:
condition: service_healthy
healthcheck:
test: celery -b redis://redis:6379 -A basket.news inspect ping
test: rq info -R default | grep -q "queues"
interval: 3s
# This healthcheck takes forever to start/complete!?
timeout: 60s
retries: 10
timeout: 1s
retries: 5
mysql:
profiles: [integration-test]
image: mariadb:11.2.3
Expand Down
5 changes: 1 addition & 4 deletions tests/integration/basket.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ CTMS_CLIENT_SECRET=bogus_MzOWu8UMz5N6M4--2iX9jgJ05JX5MziH6KeH8dI6hrw # pragma:
DEBUG=True
ALLOWED_HOSTS=*
SECRET_KEY=sssssssshhhhhhhhhh # pragma: allowlist secret
CELERY_TASK_ALWAYS_EAGER=False
CELERY_NUM_WORKERS=1
# CELERY_POOL=prefork
CELERY_LOG_LEVEL=debug
RQ_IS_ASYNC=True
DJANGO_LOG_LEVEL=DEBUG
OAUTHLIB_INSECURE_TRANSPORT=1
URLWAIT_TIMEOUT=30
Loading