Update Rabbitmq version to 3.12 (#286)

* Updated rabbitmq version to 3.12 * Updated rabbitmq version to 3.12 in cli tests * Updated rabbitmq version to 3.12 in core tests * Updated rabbitmq version to 3.12 in system tests * Delete cli test * pixl_imaging tests work locally without platform specified * remove specified platform sys tests * Fix merge conflict --------- Co-authored-by: ruaridhg <[email protected]>
SAFEHR-data · Feb 14, 2024 · ade975c · ade975c
1 parent 0442860
commit ade975c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -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}

diff --git a/pixl_core/tests/docker-compose.yml b/pixl_core/tests/docker-compose.yml
@@ -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

diff --git a/pixl_imaging/tests/docker-compose.yml b/pixl_imaging/tests/docker-compose.yml
@@ -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
@@ -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"
diff --git a/pixl_imaging/tests/run-tests.sh b/pixl_imaging/tests/run-tests.sh
@@ -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