Merge pull request #205 from jmtd/bring-back-jolokia

jmtd · web-flow · commit 3525f0262654 · 2021-04-28T14:56:08.000+01:00
[OPENJDK-37] Delay removing Jolokia to the next release
diff --git a/openjdk-11-rhel7.yaml b/openjdk-11-rhel7.yaml
@@ -42,6 +42,8 @@ modules:
     version: "11"
   - name: jboss.container.prometheus
     version: "7"
+  - name: jboss.container.jolokia
+    version: "7"
   - name: jboss.container.java.s2i.bash
   - name: jboss.container.maven
     version: "7.0.3.6"
diff --git a/openjdk18-openshift.yaml b/openjdk18-openshift.yaml
@@ -43,6 +43,8 @@ modules:
     version: "8"
   - name: jboss.container.prometheus
     version: "7"
+  - name: jboss.container.jolokia
+    version: "7"
   - name: jboss.container.java.s2i.bash
   - name: jboss.container.maven
     version: "7.0.3.6"
diff --git a/templates/openjdk-web-basic-s2i.json b/templates/openjdk-web-basic-s2i.json
@@ -259,6 +259,11 @@
                                 "env": [
                                 ],
                                 "ports": [
+                                    {
+                                        "name": "jolokia",
+                                        "containerPort": 8778,
+                                        "protocol": "TCP"
+                                    },
                                     {
                                         "name": "http",
                                         "containerPort": 8080,
diff --git a/tests/arq/src/test/resources/openjdk18-mysql-persistent-s2i.json b/tests/arq/src/test/resources/openjdk18-mysql-persistent-s2i.json
@@ -459,6 +459,11 @@
                                     }
                                 ],
                                 "ports": [
+                                    {
+                                        "name": "jolokia",
+                                        "containerPort": 8778,
+                                        "protocol": "TCP"
+                                    },
                                     {
                                         "name": "http",
                                         "containerPort": 8080,
diff --git a/tests/arq/src/test/resources/openjdk18-mysql-s2i.json b/tests/arq/src/test/resources/openjdk18-mysql-s2i.json
@@ -453,6 +453,11 @@
                                     }
                                 ],
                                 "ports": [
+                                    {
+                                        "name": "jolokia",
+                                        "containerPort": 8778,
+                                        "protocol": "TCP"
+                                    },
                                     {
                                         "name": "http",
                                         "containerPort": 8080,
diff --git a/tests/arq/src/test/resources/openjdk18-postgresql-persistent-s2i.json b/tests/arq/src/test/resources/openjdk18-postgresql-persistent-s2i.json
@@ -444,6 +444,11 @@
                                     }
                                 ],
                                 "ports": [
+                                    {
+                                        "name": "jolokia",
+                                        "containerPort": 8778,
+                                        "protocol": "TCP"
+                                    },
                                     {
                                         "name": "http",
                                         "containerPort": 8080,
diff --git a/tests/arq/src/test/resources/openjdk18-postgresql-s2i.json b/tests/arq/src/test/resources/openjdk18-postgresql-s2i.json
@@ -438,6 +438,11 @@
                                     }
                                 ],
                                 "ports": [
+                                    {
+                                        "name": "jolokia",
+                                        "containerPort": 8778,
+                                        "protocol": "TCP"
+                                    },
                                     {
                                         "name": "http",
                                         "containerPort": 8080,
diff --git a/tests/arq/src/test/resources/openjdk18-web-https-s2i.json b/tests/arq/src/test/resources/openjdk18-web-https-s2i.json
@@ -366,6 +366,11 @@
                                     }
                                 ],
                                 "ports": [
+                                    {
+                                        "name": "jolokia",
+                                        "containerPort": 8778,
+                                        "protocol": "TCP"
+                                    },
                                     {
                                         "name": "http",
                                         "containerPort": 8080,
diff --git a/tests/features/java/ports.feature b/tests/features/java/ports.feature
@@ -8,7 +8,9 @@ Feature: Openshift OpenJDK port tests
   Scenario: Check ports are available
     Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
     Then check that port 8080 is open
+    Then check that port 8778 is open
     Then inspect container
        | path                    | value       |
        | /Config/ExposedPorts    | 8080/tcp    |
        | /Config/ExposedPorts    | 8443/tcp    |
+       | /Config/ExposedPorts    | 8778/tcp    |
diff --git a/tests/features/java/runtime.feature b/tests/features/java/runtime.feature
@@ -32,3 +32,4 @@ Feature: Openshift OpenJDK Runtime tests
        | JAVA_DIAGNOSTICS | true                |
     Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test
       And container log should contain -XX:NativeMemoryTracking=summary
+      And container log should contain Jolokia: Agent started
diff --git a/ubi8-openjdk-11.yaml b/ubi8-openjdk-11.yaml
@@ -43,6 +43,7 @@ modules:
   - name: jboss.container.openjdk.jdk
     version: "11"
   - name: jboss.container.prometheus
+  - name: jboss.container.jolokia
   - name: jboss.container.maven
     version: "8.2.3.6"
   - name: jboss.container.java.s2i.bash
diff --git a/ubi8-openjdk-8.yaml b/ubi8-openjdk-8.yaml
@@ -43,6 +43,7 @@ modules:
   - name: jboss.container.openjdk.jdk
     version: "8"
   - name: jboss.container.prometheus
+  - name: jboss.container.jolokia
   - name: jboss.container.maven
     version: "8.2.3.6.8"
   - name: jboss.container.java.s2i.bash

Original file line number	Diff line number	Diff line change
`@@ -459,6 +459,11 @@`
`459`	`459`	`}`
`460`	`460`	`],`
`461`	`461`	`"ports": [`
	`462`	`+ {`
	`463`	`+ "name": "jolokia",`
	`464`	`+ "containerPort": 8778,`
	`465`	`+ "protocol": "TCP"`
	`466`	`+ },`
`462`	`467`	`{`
`463`	`468`	`"name": "http",`
`464`	`469`	`"containerPort": 8080,`
Original file line number	Diff line number	Diff line change
`@@ -453,6 +453,11 @@`
`453`	`453`	`}`
`454`	`454`	`],`
`455`	`455`	`"ports": [`
	`456`	`+ {`
	`457`	`+ "name": "jolokia",`
	`458`	`+ "containerPort": 8778,`
	`459`	`+ "protocol": "TCP"`
	`460`	`+ },`
`456`	`461`	`{`
`457`	`462`	`"name": "http",`
`458`	`463`	`"containerPort": 8080,`
Original file line number	Diff line number	Diff line change
`@@ -444,6 +444,11 @@`
`444`	`444`	`}`
`445`	`445`	`],`
`446`	`446`	`"ports": [`
	`447`	`+ {`
	`448`	`+ "name": "jolokia",`
	`449`	`+ "containerPort": 8778,`
	`450`	`+ "protocol": "TCP"`
	`451`	`+ },`
`447`	`452`	`{`
`448`	`453`	`"name": "http",`
`449`	`454`	`"containerPort": 8080,`
Original file line number	Diff line number	Diff line change
`@@ -438,6 +438,11 @@`
`438`	`438`	`}`
`439`	`439`	`],`
`440`	`440`	`"ports": [`
	`441`	`+ {`
	`442`	`+ "name": "jolokia",`
	`443`	`+ "containerPort": 8778,`
	`444`	`+ "protocol": "TCP"`
	`445`	`+ },`
`441`	`446`	`{`
`442`	`447`	`"name": "http",`
`443`	`448`	`"containerPort": 8080,`
Original file line number	Diff line number	Diff line change
`@@ -366,6 +366,11 @@`
`366`	`366`	`}`
`367`	`367`	`],`
`368`	`368`	`"ports": [`
	`369`	`+ {`
	`370`	`+ "name": "jolokia",`
	`371`	`+ "containerPort": 8778,`
	`372`	`+ "protocol": "TCP"`
	`373`	`+ },`
`369`	`374`	`{`
`370`	`375`	`"name": "http",`
`371`	`376`	`"containerPort": 8080,`