ci(custom_targets): correct broken behaviour from #188

pom.xml

@@ -55,6 +55,7 @@
     <surefire.rerunFailingTestsCount>2</surefire.rerunFailingTestsCount>
     <failsafe-plugin.version>3.2.3</failsafe-plugin.version>
     <failsafe.rerunFailingTestsCount>${surefire.rerunFailingTestsCount}</failsafe.rerunFailingTestsCount>
+    <com.google.code.gson.version>2.10.1</com.google.code.gson.version><!-- TODO drop this -->
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -229,6 +230,12 @@
       <version>${com.github.spotbugs.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>${com.google.code.gson.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.rest-assured</groupId>
       <artifactId>rest-assured</artifactId>

smoketest/compose/sample-apps.yml

@@ -1,6 +1,6 @@
 version: "3"
 services:
-  sample-app-1:
+  sample-app:
     depends_on:
       cryostat:
         condition: service_healthy
@@ -12,17 +12,17 @@ services:
       CRYOSTAT_AGENT_APP_NAME: "vertx-fib-demo-1"
       CRYOSTAT_AGENT_WEBCLIENT_SSL_TRUST_ALL: "true"
       CRYOSTAT_AGENT_WEBCLIENT_SSL_VERIFY_HOSTNAME: "false"
-      CRYOSTAT_AGENT_WEBSERVER_HOST: "sample-app-1"
+      CRYOSTAT_AGENT_WEBSERVER_HOST: "sample-app"
       CRYOSTAT_AGENT_WEBSERVER_PORT: "8910"
-      CRYOSTAT_AGENT_CALLBACK: "http://sample-app-1:8910/"
+      CRYOSTAT_AGENT_CALLBACK: "http://sample-app:8910/"
       CRYOSTAT_AGENT_BASEURI: "http://cryostat:8181/"
       CRYOSTAT_AGENT_TRUST_ALL: "true"
       CRYOSTAT_AGENT_AUTHORIZATION: "Basic dXNlcjpwYXNz"
     ports:
       - "8081:8081"
     labels:
       io.cryostat.discovery: "true"
-      io.cryostat.jmxHost: "sample-app-1"
+      io.cryostat.jmxHost: "sample-app"
       io.cryostat.jmxPort: "9093"
     restart: always
     healthcheck:
@@ -31,63 +31,6 @@ services:
       retries: 3
       start_period: 10s
       timeout: 5s
-  sample-app-2:
-    depends_on:
-      cryostat:
-        condition: service_healthy
-    image: quay.io/andrewazores/vertx-fib-demo:0.13.0
-    hostname: vertx-fib-demo-2
-    environment:
-      HTTP_PORT: 8082
-      JMX_PORT: 9094
-      USE_AUTH: "true"
-      CRYOSTAT_AGENT_APP_NAME: "vertx-fib-demo-2"
-      CRYOSTAT_AGENT_WEBCLIENT_SSL_TRUST_ALL: "true"
-      CRYOSTAT_AGENT_WEBCLIENT_SSL_VERIFY_HOSTNAME: "false"
-      CRYOSTAT_AGENT_WEBSERVER_HOST: "sample-app-2"
-      CRYOSTAT_AGENT_WEBSERVER_PORT: "8911"
-      CRYOSTAT_AGENT_CALLBACK: "http://sample-app-2:8911/"
-      CRYOSTAT_AGENT_BASEURI: "http://cryostat:8181/"
-      CRYOSTAT_AGENT_TRUST_ALL: "true"
-      CRYOSTAT_AGENT_AUTHORIZATION: "Basic dXNlcjpwYXNz"
-    ports:
-      - "8082:8082"
-    restart: always
-    healthcheck:
-      test: curl --fail http://localhost:8081 || exit 1
-      interval: 10s
-      retries: 3
-      start_period: 10s
-      timeout: 5s
-  sample-app-3:
-    depends_on:
-      cryostat:
-        condition: service_healthy
-    image: quay.io/andrewazores/vertx-fib-demo:0.13.0
-    hostname: vertx-fib-demo-3
-    environment:
-      HTTP_PORT: 8083
-      JMX_PORT: 9095
-      USE_AUTH: "true"
-      USE_SSL: "true"
-      CRYOSTAT_AGENT_APP_NAME: "vertx-fib-demo-3"
-      CRYOSTAT_AGENT_WEBCLIENT_SSL_TRUST_ALL: "true"
-      CRYOSTAT_AGENT_WEBCLIENT_SSL_VERIFY_HOSTNAME: "false"
-      CRYOSTAT_AGENT_WEBSERVER_HOST: "sample-app-3"
-      CRYOSTAT_AGENT_WEBSERVER_PORT: "8910"
-      CRYOSTAT_AGENT_CALLBACK: "http://sample-app-3:8912/"
-      CRYOSTAT_AGENT_BASEURI: "http://cryostat:8181/"
-      CRYOSTAT_AGENT_TRUST_ALL: "true"
-      CRYOSTAT_AGENT_AUTHORIZATION: "Basic dXNlcjpwYXNz"
-    ports:
-      - "8083:8083"
-    restart: always
-    healthcheck:
-      test: curl --fail http://localhost:8081 || exit 1
-      interval: 10s
-      retries: 3
-      start_period: 10s
-      timeout: 5s
   quarkus-test-agent:
     image: quay.io/andrewazores/quarkus-test:latest
     # do not add a depends_on:cryostat here, so that we can test that the agent is tolerant of that state
@@ -97,7 +40,7 @@ services:
     expose:
       - "9977"
     environment:
-      JAVA_OPTS_APPEND: "-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -javaagent:/deployments/app/cryostat-agent.jar"
+      JAVA_OPTS: "-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -javaagent:/deployments/app/cryostat-agent.jar"
       QUARKUS_HTTP_PORT: 10010
       ORG_ACME_CRYOSTATSERVICE_ENABLED: "false"
       CRYOSTAT_AGENT_APP_NAME: quarkus-test-agent

smoketest/k8s/sample-app-1-deployment.yaml → smoketest/k8s/sample-app-deployment.yaml

@@ -3,28 +3,28 @@ kind: Deployment
 metadata:
   annotations:
     io.cryostat.discovery: "true"
-    io.cryostat.jmxHost: sample-app-1
+    io.cryostat.jmxHost: sample-app
     io.cryostat.jmxPort: "9093"
   creationTimestamp: null
   labels:
-    io.kompose.service: sample-app-1
-  name: sample-app-1
+    io.kompose.service: sample-app
+  name: sample-app
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: sample-app-1
+      io.kompose.service: sample-app
   strategy: {}
   template:
     metadata:
       annotations:
         io.cryostat.discovery: "true"
-        io.cryostat.jmxHost: sample-app-1
+        io.cryostat.jmxHost: sample-app
         io.cryostat.jmxPort: "9093"
       creationTimestamp: null
       labels:
         io.kompose.network/compose-default: "true"
-        io.kompose.service: sample-app-1
+        io.kompose.service: sample-app
     spec:
       containers:
         - env:
@@ -35,15 +35,15 @@ spec:
             - name: CRYOSTAT_AGENT_BASEURI
               value: http://cryostat:8181/
             - name: CRYOSTAT_AGENT_CALLBACK
-              value: http://sample-app-1:8910/
+              value: http://sample-app:8910/
             - name: CRYOSTAT_AGENT_TRUST_ALL
               value: "true"
             - name: CRYOSTAT_AGENT_WEBCLIENT_SSL_TRUST_ALL
               value: "true"
             - name: CRYOSTAT_AGENT_WEBCLIENT_SSL_VERIFY_HOSTNAME
               value: "false"
             - name: CRYOSTAT_AGENT_WEBSERVER_HOST
-              value: sample-app-1
+              value: sample-app
             - name: CRYOSTAT_AGENT_WEBSERVER_PORT
               value: "8910"
             - name: HTTP_PORT
@@ -59,7 +59,7 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 10
             timeoutSeconds: 5
-          name: sample-app-1
+          name: sample-app
           ports:
             - containerPort: 8081
               hostPort: 8081

smoketest/k8s/sample-app-1-service.yaml → smoketest/k8s/sample-app-service.yaml

@@ -3,18 +3,18 @@ kind: Service
 metadata:
   annotations:
     io.cryostat.discovery: "true"
-    io.cryostat.jmxHost: sample-app-1
+    io.cryostat.jmxHost: sample-app
     io.cryostat.jmxPort: "9093"
   creationTimestamp: null
   labels:
-    io.kompose.service: sample-app-1
-  name: sample-app-1
+    io.kompose.service: sample-app
+  name: sample-app
 spec:
   ports:
     - name: "8081"
       port: 8081
       targetPort: 8081
   selector:
-    io.kompose.service: sample-app-1
+    io.kompose.service: sample-app
 status:
   loadBalancer: {}