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

Update Rabbitmq version to 3.12 #286

Merged
merged 9 commits into from
Feb 14, 2024
Merged

Update Rabbitmq version to 3.12 #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ef90e28
Updated rabbitmq version to 3.12
ruaridhg Feb 7, 2024
14fbf52
Updated rabbitmq version to 3.12 in cli tests
ruaridhg Feb 7, 2024
2bf3adc
Updated rabbitmq version to 3.12 in core tests
ruaridhg Feb 7, 2024
cb4e319
Updated rabbitmq version to 3.12 in system tests
ruaridhg Feb 7, 2024
3d1f7aa
Delete cli test
ruaridhg Feb 7, 2024
7057899
pixl_imaging tests work locally without platform specified
ruaridhg Feb 13, 2024
f21e589
remove specified platform sys tests
ruaridhg Feb 13, 2024
40e4553
Merge branch 'main' into rmg/fix-docker-imaging
ruaridhg Feb 13, 2024
aeff948
Fix merge conflict
ruaridhg Feb 13, 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
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ services:
restart: "no"

queue:
image: rabbitmq:3.11.2-management
image: rabbitmq:3.12.9-management
environment:
RABBITMQ_DEFAULT_USER: ${RABBITMQ_USERNAME}
RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
Expand Down
2 changes: 1 addition & 1 deletion pixl_core/tests/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:

queue:
container_name: pixl-test-queue
image: rabbitmq:3.11.2-management
image: rabbitmq:3.12.9-management
environment:
RABBITMQ_DEFAULT_USER: guest
RABBITMQ_DEFAULT_PASS: guest
Expand Down
14 changes: 7 additions & 7 deletions pixl_imaging/tests/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ services:
orthanc-raw:
condition: service_started
healthcheck:
interval: 10s
timeout: 30s
retries: 5
interval: 5s
timeout: 5s
retries: 10
environment:
LOG_LEVEL: DEBUG
RABBITMQ_PASSWORD: guest
Expand Down Expand Up @@ -93,12 +93,12 @@ services:

queue:
container_name: pixl-test-queue
image: rabbitmq:3.11.2-management
image: rabbitmq:3.12.9-management
healthcheck:
test: rabbitmq-diagnostics -q check_running
interval: 30s
timeout: 30s
retries: 3
interval: 5s
timeout: 5s
retries: 20
ports:
- "5672:5672"
- "15672:15672"
4 changes: 2 additions & 2 deletions pixl_imaging/tests/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ THIS_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
PACKAGE_DIR="${THIS_DIR%/*}"
cd "$PACKAGE_DIR"/tests || exit

docker compose up -d --build
docker compose up --wait --build
docker exec pixl-test-imaging-api /bin/bash -c "pytest tests -m processing"
docker compose down
docker compose down --volumes
Loading