Skip to content

Commit 9f7aba8

Browse files
committed
changed to use map for LB_TYPE jenkins-ignore
1 parent 9df6ced commit 9f7aba8

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ public static void staticPrepare() throws Exception {
6161
// create domain
6262
if (domain == null) {
6363
logger.info("Creating WLS Domain & waiting for the script to complete execution");
64-
System.setProperty("LB_TYPE", "VOYAGER");
65-
domain = TestUtils.createDomain(DOMAINONPV_WLST_YAML);
64+
Map<String, Object> domainMap = TestUtils.loadYaml(DOMAINONPV_WLST_YAML);
65+
domainMap.put("LB_TYPE", "VOYAGER");
66+
domain = TestUtils.createDomain(domainMap);
6667
domain.verifyDomainCreated();
6768
}
6869

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,8 +1296,8 @@ protected void initialize(Map<String, Object> inputDomainMap) throws Exception {
12961296

12971297
this.voyager =
12981298
(System.getenv("LB_TYPE") != null && System.getenv("LB_TYPE").equalsIgnoreCase("VOYAGER"))
1299-
|| (System.getProperty("LB_TYPE") != null
1300-
&& System.getProperty("LB_TYPE").equalsIgnoreCase("VOYAGER"));
1299+
|| (inputDomainMap.containsValue("VOYAGER"));
1300+
13011301
if (System.getenv("INGRESSPERDOMAIN") != null) {
13021302
INGRESSPERDOMAIN = new Boolean(System.getenv("INGRESSPERDOMAIN")).booleanValue();
13031303
}

0 commit comments

Comments
 (0)