Skip to content

Commit

Permalink
test(smoketest): restore healthcheck, remove obsolete version declara…
Browse files Browse the repository at this point in the history
…tions (#713)

* test(smoketest): restore Cryostat healthcheck

* chore(smoketest): remove obsolete 'version' declaration
  • Loading branch information
andrewazores authored Nov 25, 2024
1 parent 1e758de commit c3efa62
Showing 29 changed files with 6 additions and 37 deletions.
1 change: 0 additions & 1 deletion compose/auth_proxy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
expose:
1 change: 0 additions & 1 deletion compose/auth_proxy_https.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
environment:
1 change: 0 additions & 1 deletion compose/cryostat-grafana.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
environment:
15 changes: 6 additions & 9 deletions compose/cryostat.yml
Original file line number Diff line number Diff line change
@@ -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:
1 change: 0 additions & 1 deletion compose/cryostat_docker.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
depends_on:
1 change: 0 additions & 1 deletion compose/cryostat_k8s.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
depends_on:
1 change: 0 additions & 1 deletion compose/db-viewer.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
db-viewer:
depends_on:
1 change: 0 additions & 1 deletion compose/db.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
depends_on:
1 change: 0 additions & 1 deletion compose/grafana_no_proxy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
environment:
1 change: 0 additions & 1 deletion compose/jfr-datasource.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
environment:
1 change: 0 additions & 1 deletion compose/no_proxy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
hostname: cryostat
1 change: 0 additions & 1 deletion compose/reports.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
environment:
1 change: 0 additions & 1 deletion compose/s3-cloudserver.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
depends_on:
1 change: 0 additions & 1 deletion compose/s3-localstack.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
depends_on:
1 change: 0 additions & 1 deletion compose/s3-minio.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
depends_on:
1 change: 0 additions & 1 deletion compose/s3-none.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
environment:
1 change: 0 additions & 1 deletion compose/s3-seaweed.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cryostat:
depends_on:
1 change: 0 additions & 1 deletion compose/s3_no_proxy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
s3:
ports:
1 change: 0 additions & 1 deletion compose/sample_apps/gameserver-jdk11.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
gameserver-jdk11:
depends_on:
1 change: 0 additions & 1 deletion compose/sample_apps/gameserver-jdk17.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
gameserver-jdk17:
depends_on:
1 change: 0 additions & 1 deletion compose/sample_apps/gameserver-jdk21.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
gameserver-jdk21:
depends_on:
1 change: 0 additions & 1 deletion compose/sample_apps/opensearch.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
opensearch-node:
image: docker.io/opensearchproject/opensearch:latest
1 change: 0 additions & 1 deletion compose/sample_apps/quarkus-cryostat-agent.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
quarkus-cryostat-agent:
image: ${QUARKUS_TEST_IMAGE:-quay.io/redhat-java-monitoring/quarkus-cryostat-agent:latest}
1 change: 0 additions & 1 deletion compose/sample_apps/quarkus-cryostat-agent_https.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
quarkus-cryostat-agent:
environment:
1 change: 0 additions & 1 deletion compose/sample_apps/spring-boot-2-7.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
spring-boot-2-7:
depends_on:
1 change: 0 additions & 1 deletion compose/sample_apps/spring-boot-3.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
spring-boot-3:
depends_on:
1 change: 0 additions & 1 deletion compose/sample_apps/vertx-cryostat-agent.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
vertx-agent-1:
depends_on:
1 change: 0 additions & 1 deletion compose/sample_apps/wildfly-23.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
wildfly-23:
depends_on:
1 change: 0 additions & 1 deletion compose/sample_apps/wildfly-28.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
wildfly-28:
depends_on:

0 comments on commit c3efa62

Please sign in to comment.