chore(smoketest): move service dependency declarations into correct f…

…iles
cryostatio · May 21, 2024 · 37cc8ee · 37cc8ee
1 parent 1d991d1
commit 37cc8ee
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/compose/cryostat.yml b/compose/cryostat.yml
@@ -1,11 +1,6 @@
 version: "3"
 services:
   cryostat:
-    depends_on:
-      db:
-        condition: service_healthy
-      s3:
-        condition: service_healthy
     deploy:
       resources:
         limits:

diff --git a/compose/db.yml b/compose/db.yml
@@ -1,6 +1,9 @@
 version: "3"
 services:
   cryostat:
+    depends_on:
+      db:
+        condition: service_healthy
     environment:
       QUARKUS_HIBERNATE_ORM_DATABASE_GENERATION: ${DATABASE_GENERATION:-drop-and-create}
       QUARKUS_DATASOURCE_USERNAME: cryostat3

diff --git a/compose/s3-cloudserver.yml b/compose/s3-cloudserver.yml
@@ -1,6 +1,9 @@
 version: "3"
 services:
   cryostat:
+    depends_on:
+      s3:
+        condition: service_healthy
     environment:
       STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
       QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:8000

diff --git a/compose/s3-localstack.yml b/compose/s3-localstack.yml
@@ -1,6 +1,9 @@
 version: "3"
 services:
   cryostat:
+    depends_on:
+      s3:
+        condition: service_healthy
     environment:
       STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
       QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:4566

diff --git a/compose/s3-minio.yml b/compose/s3-minio.yml
@@ -1,6 +1,9 @@
 version: "3"
 services:
   cryostat:
+    depends_on:
+      s3:
+        condition: service_healthy
     environment:
       STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
       QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:9000

diff --git a/compose/s3-seaweed.yml b/compose/s3-seaweed.yml
@@ -1,6 +1,9 @@
 version: "3"
 services:
   cryostat:
+    depends_on:
+      s3:
+        condition: service_healthy
     environment:
       STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
       CRYOSTAT_SERVICES_REPORTS_STORAGE_CACHE_NAME: archivedreports