main(tests): remove rabbitmq from unit-tests (#5307)

* main(tests): remove rabbitmq from unit-tests service * main(tests): remove rabbitmq from unit-tests * fix(tests): overwrite broker values from dockerfile
DefectDojo · Nov 8, 2021 · 64e6aa2 · 64e6aa2
1 parent c016aea
commit 64e6aa2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/docker-compose.override.unit_tests.yml b/docker-compose.override.unit_tests.yml
@@ -15,6 +15,13 @@ services:
       DD_DEBUG: 'True'
       DD_TEST_DATABASE_NAME: "${DD_TEST_DATABASE_NAME:-test_defectdojo}"
       DD_DATABASE_NAME: "${DD_TEST_DATABASE_NAME:-test_defectdojo}"
+      DD_CELERY_BROKER_SCHEME: 'sqla+sqlite'
+      DD_CELERY_BROKER_USER: ''
+      DD_CELERY_BROKER_PASSWORD: ''
+      DD_CELERY_BROKER_HOST: ''
+      DD_CELERY_BROKER_PORT: "-1"
+      DD_CELERY_BROKER_PATH: '/dojo.celerydb.sqlite'
+      DD_CELERY_BROKER_PARAMS: ''
   celerybeat:
     image: busybox:1.34.1-musl
     entrypoint: ['echo', 'skipping', 'celery beat']
@@ -24,7 +31,6 @@ services:
   initializer:
     image: busybox:1.34.1-musl
     entrypoint: ['echo', 'skipping', 'initializer']
-
   mysql:
     ports:
       - target: 3306
@@ -35,6 +41,9 @@ services:
       MYSQL_DATABASE: "${DD_TEST_DATABASE_NAME:-test_defectdojo}"
     volumes:
        - defectdojo_data_unittest:/var/lib/mysql
+  rabbitmq:
+    image: busybox:1.34.0-musl
+    entrypoint: ['echo', 'skipping', 'rabbitmq']
 volumes:
   defectdojo_data_unittest: {}
   defectdojo_media_unittest: {}
diff --git a/docker-compose.override.unit_tests_cicd.yml b/docker-compose.override.unit_tests_cicd.yml
@@ -15,6 +15,13 @@ services:
       DD_DEBUG: 'True'
       DD_TEST_DATABASE_NAME: "${DD_TEST_DATABASE_NAME:-test_defectdojo}"
       DD_DATABASE_NAME: "${DD_TEST_DATABASE_NAME:-test_defectdojo}"
+      DD_CELERY_BROKER_SCHEME: 'sqla+sqlite'
+      DD_CELERY_BROKER_USER: ''
+      DD_CELERY_BROKER_PASSWORD: ''
+      DD_CELERY_BROKER_HOST: ''
+      DD_CELERY_BROKER_PORT: "-1"
+      DD_CELERY_BROKER_PATH: '/dojo.celerydb.sqlite'
+      DD_CELERY_BROKER_PARAMS: ''
   celerybeat:
     image: busybox:1.34.1-musl
     entrypoint: ['echo', 'skipping', 'celery beat']
@@ -34,6 +41,9 @@ services:
       MYSQL_DATABASE: "${DD_TEST_DATABASE_NAME:-test_defectdojo}"
     volumes:
        - defectdojo_data_unittest:/var/lib/mysql
+  rabbitmq:
+    image: busybox:1.34.0-musl
+    entrypoint: ['echo', 'skipping', 'rabbitmq']
 volumes:
   defectdojo_data_unittest: {}
   defectdojo_media_unittest: {}