Skip to content

Commit 60dc370

Browse files
committed
WFWIP-465 - re-enable jolokia tests on JDK 17
1 parent f6dff0e commit 60dc370

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

tests/features/basic.feature

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ Feature: Common EAP tests
9292
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 2 elements on XPath //*[local-name()="protocol"][@type="openshift.DNS_PING"]
9393
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 0 elements on XPath //*[local-name()="protocol"][@type="openshift.KUBE_PING"]
9494
95+
Scenario: Check if jolokia is configured correctly
96+
When container is ready
97+
 Then container log should contain -javaagent:/usr/share/java/jolokia-jvm-agent/jolokia-jvm.jar=config=/opt/jboss/container/jolokia/etc/jolokia.properties
98+
9599
@redhat-sso-7-tech-preview/sso-cd-openshift @redhat-sso-7/sso73-openshift
96100
# https://issues.jboss.org/browse/CLOUD-295
97101
# https://issues.jboss.org/browse/CLOUD-336

tests/features/common.feature

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
@jboss-eap-7 @jboss-eap-6 @jboss-eap-7-tech-preview
22
Feature: Openshift common test
33

4+
Scenario: Check jolokia port is available
5+
When container is ready
6+
Then check that port 8778 is open
7+
Then inspect container
8+
| path | value |
9+
| /Config/ExposedPorts | 8778/tcp |
10+
411
Scenario: Enable Access Log
512
When container is started with env
613
| variable | value |

tests/features/not-jdk17.feature

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,6 @@
22
@jboss-eap-7/eap-xp3-openjdk11-openshift-rhel8 @jboss-eap-7/eap-xp4-openjdk11-openshift-rhel8
33
Feature: Tests that can't run on jdk17
44

5-
Scenario: Check if jolokia is configured correctly
6-
When container is ready
7-
Then container log should contain -javaagent:/usr/share/java/jolokia-jvm-agent/jolokia-jvm.jar=config=/opt/jboss/container/jolokia/etc/jolokia.properties
8-
9-
Scenario: Check jolokia port is available
10-
When container is ready
11-
Then check that port 8778 is open
12-
Then inspect container
13-
| path | value |
14-
| /Config/ExposedPorts | 8778/tcp |
15-
165
# JDK 11 images don't have xjc or wsimport
176
# This one is to be ignored when running jboss-eap-7/eap74-openjdk17-openshift-rhel8
187
@jboss-eap-7-tech-preview/eap72-openjdk11-openshift

0 commit comments

Comments
 (0)