test(smoketest): use updated gameserver image (#773)

compose/cryostat.yml

@@ -22,7 +22,7 @@ services:
       CRYOSTAT_DISCOVERY_JDP_ENABLED: ${CRYOSTAT_DISCOVERY_JDP_ENABLED:-true}
       CRYOSTAT_DISCOVERY_PODMAN_ENABLED: ${CRYOSTAT_DISCOVERY_PODMAN_ENABLED:-true}
       CRYOSTAT_DISCOVERY_DOCKER_ENABLED: ${CRYOSTAT_DISCOVERY_DOCKER_ENABLED:-true}
-      CRYOSTAT_AGENT_TLS_REQUIRED: ${ENFORCE_AGENT_TLS:-true}
+      CRYOSTAT_AGENT_TLS_REQUIRED: ${ENFORCE_AGENT_TLS:-false}
       JAVA_OPTS_APPEND: >-
         -XX:+FlightRecorder
         -XX:StartFlightRecording=filename=/tmp/,name=onstart,settings=default,disk=true,maxage=5m

compose/sample_apps/gameserver-jdk21.yml → compose/sample_apps/gameserver.yml

@@ -1,21 +1,20 @@
 services:
-  gameserver-jdk21:
-    depends_on:
-      cryostat:
-        condition: service_healthy
-    image: ${GAMESERVER_JDK21_TEST_IMAGE:-quay.io/redhat-java-monitoring/gameserver-cryostat-agent:latest-jdk21}
-    hostname: gameserver-jdk21
+  gameserver:
+    # depends_on:
+    #   cryostat:
+    #     condition: service_healthy
+    image: ${GAMESERVER_TEST_IMAGE:-quay.io/redhat-java-monitoring/gameserver-cryostat-agent:latest}
+    hostname: gameserver
     ports:
-      - "7093"
-      - "9496"
+      - "25565"
     environment:
-      CRYOSTAT_AGENT_APP_NAME: gameserver-jdk21
-      CRYOSTAT_AGENT_WEBSERVER_HOST: gameserver-jdk21
+      CRYOSTAT_AGENT_APP_NAME: gameserver
+      CRYOSTAT_AGENT_WEBSERVER_HOST: gameserver
       CRYOSTAT_AGENT_WEBSERVER_PORT: 9496
       CRYOSTAT_AGENT_WEBCLIENT_TLS_TRUSTSTORE_CERT[0]_PATH: /auth_certs/certificate.pem
       CRYOSTAT_AGENT_WEBCLIENT_TLS_TRUSTSTORE_CERT[0]_TYPE: X.509
       CRYOSTAT_AGENT_WEBCLIENT_TLS_TRUSTSTORE_CERT[0]_ALIAS: cryostat
-      CRYOSTAT_AGENT_CALLBACK: http://gameserver-jdk21:9496/
+      CRYOSTAT_AGENT_CALLBACK: http://gameserver:9496/
       CRYOSTAT_AGENT_BASEURI: ${CRYOSTAT_PROXY_PROTOCOL}://${CRYOSTAT_HTTP_HOST}:${CRYOSTAT_PROXY_PORT}/
       CRYOSTAT_AGENT_BASEURI_RANGE: public
       CRYOSTAT_AGENT_AUTHORIZATION_TYPE: basic
@@ -26,15 +25,15 @@ services:
       CRYOSTAT_AGENT_HARVESTER_MAX_FILES: 3
       CRYOSTAT_AGENT_HARVESTER_EXIT_MAX_AGE_MS: 60000
       CRYOSTAT_AGENT_HARVESTER_EXIT_MAX_SIZE_B: 153600 # "$(echo 1024*150 | bc)"
-      VERSION: 1.20.5
-      EULA: "true"
-      ONLINE_MODE: "false"
-      OVERRIDE_SERVER_PROPERTIES: "true"
-      ENABLE_JMX: "true"
-      JMX_HOST: gameserver-jdk21
-      JMX_PORT: "7093"
-      JVM_OPTS: >-
+      MINECRAFT_ONLINE_MODE: "false"
+      JAVA_OPTS: >-
         -Dio.cryostat.agent.shaded.org.slf4j.simpleLogger.defaultLogLevel=trace
         -javaagent:/opt/cryostat/agent.jar
     volumes:
       - ${DIR}/compose/auth_certs:/auth_certs:z
+    healthcheck:
+      test: /usr/bin/healthcheck
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s

smoketest.bash

@@ -26,7 +26,7 @@ DEPLOY_GRAFANA=${DEPLOY_GRAFANA:-true}
 DRY_RUN=${DRY_RUN:-false}
 USE_TLS=${USE_TLS:-true}
 SAMPLE_APPS_USE_TLS=${SAMPLE_APPS_USE_TLS:-true}
-ENFORCE_AGENT_TLS=${ENFORCE_AGENT_TLS:-true}
+ENFORCE_AGENT_TLS=${ENFORCE_AGENT_TLS:-false}
 
 display_usage() {
     echo "Usage:"