test(smoketest): restore healthcheck, remove obsolete version declara…

…tions (#713) * test(smoketest): restore Cryostat healthcheck * chore(smoketest): remove obsolete 'version' declaration
cryostatio · Nov 25, 2024 · c3efa62 · c3efa62
1 parent 1e758de
commit c3efa62
Show file tree

Hide file tree

Showing 29 changed files with 6 additions and 37 deletions.
diff --git a/compose/auth_proxy.yml b/compose/auth_proxy.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     expose:

diff --git a/compose/auth_proxy_https.yml b/compose/auth_proxy_https.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     environment:

diff --git a/compose/cryostat-grafana.yml b/compose/cryostat-grafana.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     environment:

diff --git a/compose/cryostat.yml b/compose/cryostat.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     deploy:
@@ -36,14 +35,12 @@ services:
         -Dcom.sun.management.jmxremote.ssl=false
         -Dcom.sun.management.jmxremote.local.only=false
     restart: unless-stopped
-    # FIXME reenable this check. Somehow after upgrading to Quarkus 3.8, this check fails with 'connection refused',
-    # but the container comes up successfully without it and shelling into the container later to run curl succeeds
-    # healthcheck:
-    #   test: curl --fail http://cryostat:${CRYOSTAT_HTTP_PORT}/health/liveness || exit 1
-    #   interval: 10s
-    #   retries: 3
-    #   start_period: 30s
-    #   timeout: 5s
+    healthcheck:
+      test: curl --fail http://cryostat:${CRYOSTAT_HTTP_PORT}/health/liveness || exit 1
+      interval: 10s
+      retries: 3
+      start_period: 30s
+      timeout: 5s
 
 volumes:
   jmxtls_cfg:

diff --git a/compose/cryostat_docker.yml b/compose/cryostat_docker.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     depends_on:

diff --git a/compose/cryostat_k8s.yml b/compose/cryostat_k8s.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     depends_on:

diff --git a/compose/db-viewer.yml b/compose/db-viewer.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   db-viewer:
     depends_on:

diff --git a/compose/db.yml b/compose/db.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     depends_on:

diff --git a/compose/grafana_no_proxy.yml b/compose/grafana_no_proxy.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     environment:

diff --git a/compose/jfr-datasource.yml b/compose/jfr-datasource.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     environment:

diff --git a/compose/no_proxy.yml b/compose/no_proxy.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     hostname: cryostat

diff --git a/compose/reports.yml b/compose/reports.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     environment:

diff --git a/compose/s3-cloudserver.yml b/compose/s3-cloudserver.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     depends_on:

diff --git a/compose/s3-localstack.yml b/compose/s3-localstack.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     depends_on:

diff --git a/compose/s3-minio.yml b/compose/s3-minio.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     depends_on:

diff --git a/compose/s3-none.yml b/compose/s3-none.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     environment:

diff --git a/compose/s3-seaweed.yml b/compose/s3-seaweed.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cryostat:
     depends_on:

diff --git a/compose/s3_no_proxy.yml b/compose/s3_no_proxy.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   s3:
     ports:

diff --git a/compose/sample_apps/gameserver-jdk11.yml b/compose/sample_apps/gameserver-jdk11.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   gameserver-jdk11:
     depends_on:

diff --git a/compose/sample_apps/gameserver-jdk17.yml b/compose/sample_apps/gameserver-jdk17.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   gameserver-jdk17:
     depends_on:

diff --git a/compose/sample_apps/gameserver-jdk21.yml b/compose/sample_apps/gameserver-jdk21.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   gameserver-jdk21:
     depends_on:

diff --git a/compose/sample_apps/opensearch.yml b/compose/sample_apps/opensearch.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   opensearch-node:
     image: docker.io/opensearchproject/opensearch:latest

diff --git a/compose/sample_apps/quarkus-cryostat-agent.yml b/compose/sample_apps/quarkus-cryostat-agent.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   quarkus-cryostat-agent:
     image: ${QUARKUS_TEST_IMAGE:-quay.io/redhat-java-monitoring/quarkus-cryostat-agent:latest}

diff --git a/compose/sample_apps/quarkus-cryostat-agent_https.yml b/compose/sample_apps/quarkus-cryostat-agent_https.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   quarkus-cryostat-agent:
     environment:

diff --git a/compose/sample_apps/spring-boot-2-7.yml b/compose/sample_apps/spring-boot-2-7.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   spring-boot-2-7:
     depends_on:

diff --git a/compose/sample_apps/spring-boot-3.yml b/compose/sample_apps/spring-boot-3.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   spring-boot-3:
     depends_on:

diff --git a/compose/sample_apps/vertx-cryostat-agent.yml b/compose/sample_apps/vertx-cryostat-agent.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   vertx-agent-1:
     depends_on:

diff --git a/compose/sample_apps/wildfly-23.yml b/compose/sample_apps/wildfly-23.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   wildfly-23:
     depends_on:

diff --git a/compose/sample_apps/wildfly-28.yml b/compose/sample_apps/wildfly-28.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   wildfly-28:
     depends_on: