Skip to content

Commit 22d63b9

Browse files
set unique voyagerWebPort for newly merged test classes/domains
1 parent 95d2924 commit 22d63b9

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/ITMultipleClusters.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ public void testCreateDomainTwoConfiguredCluster() throws Exception {
9393
"createDomainPyScript",
9494
"integration-tests/src/test/resources/domain-home-on-pv/"
9595
+ TWO_CONFIGURED_CLUSTER_SCRIPT);
96+
if (System.getenv("LB_TYPE") != null
97+
&& System.getenv("LB_TYPE").equalsIgnoreCase("VOYAGER")) {
98+
domainMap.put("voyagerWebPort", new Integer("30366"));
99+
}
96100
addCluster2ToDomainTemplate();
97101
domain = TestUtils.createDomain(domainMap);
98102
domain.verifyDomainCreated();
@@ -136,6 +140,10 @@ public void testCreateDomainTwoMixedCluster() throws Exception {
136140
domainMap.put(
137141
"createDomainPyScript",
138142
"integration-tests/src/test/resources/domain-home-on-pv/" + TWO_MIXED_CLUSTER_SCRIPT);
143+
if (System.getenv("LB_TYPE") != null
144+
&& System.getenv("LB_TYPE").equalsIgnoreCase("VOYAGER")) {
145+
domainMap.put("voyagerWebPort", new Integer("30377"));
146+
}
139147
addCluster2ToDomainTemplate();
140148
domain = TestUtils.createDomain(domainMap);
141149
domain.verifyDomainCreated();

integration-tests/src/test/java/oracle/kubernetes/operator/ITStickySession.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public static void staticPrepare() throws Exception {
6464
Map<String, Object> domainMap = TestUtils.loadYaml(DOMAINONPV_WLST_YAML);
6565
// Treafik doesn't work due to the bug 28050300. Use Voyager instead
6666
domainMap.put("LB_TYPE", "VOYAGER");
67+
domainMap.put("voyagerWebPort", new Integer("30355"));
6768
domain = TestUtils.createDomain(domainMap);
6869
domain.verifyDomainCreated();
6970
}

0 commit comments

Comments
 (0)