Skip to content

Commit d2dd720

Browse files
committed
add VOYAGER to entire test suite
1 parent f996070 commit d2dd720

File tree

2 files changed

+55
-6
lines changed

2 files changed

+55
-6
lines changed

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

Lines changed: 54 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,15 @@ public void testDomainOnPVUsingWLST() throws Exception {
149149
Domain domain = null;
150150
boolean testCompletedSuccessfully = false;
151151
try {
152-
domain = TestUtils.createDomain(domainonpvwlstFile);
152+
// domain = TestUtils.createDomain(domainonpvwlstFile);TODO
153+
if (VOYAGER) {
154+
Map<String, Object> wlstDomainMap = TestUtils.loadYaml(domainonpvwlstFile);
155+
wlstDomainMap.put("loadBalancer", "VOYAGER");
156+
logger.info("domain1onpvwlst loadBalancer is set to: " + wlstDomainMap.get("loadBalancer"));
157+
domain = TestUtils.createDomain(wlstDomainMap);
158+
} else {
159+
domain = TestUtils.createDomain(domainonpvwlstFile);
160+
}
153161
domain.verifyDomainCreated();
154162
testBasicUseCases(domain);
155163
testAdvancedUseCasesForADomain(operator1, domain);
@@ -189,7 +197,16 @@ public void testDomainOnPVUsingWDT() throws Exception {
189197
boolean testCompletedSuccessfully = false;
190198
try {
191199
// create domain
192-
domain = TestUtils.createDomain(domainonpvwdtFile);
200+
// domain = TestUtils.createDomain(domainonpvwdtFile); TODO
201+
if (VOYAGER) {
202+
Map<String, Object> wdtDomainMap = TestUtils.loadYaml(domainonpvwdtFile);
203+
wdtDomainMap.put("loadBalancer", "VOYAGER");
204+
logger.info(
205+
"domainonpvwdtFile loadBalancer is set to: " + wdtDomainMap.get("loadBalancer"));
206+
domain = TestUtils.createDomain(wdtDomainMap);
207+
} else {
208+
domain = TestUtils.createDomain(domainonpvwdtFile);
209+
}
193210
domain.verifyDomainCreated();
194211
testBasicUseCases(domain);
195212
testWLDFScaling(operator2, domain);
@@ -337,7 +354,15 @@ public void testCreateDomainWithStartPolicyAdminOnly() throws Exception {
337354
Domain domain = null;
338355
boolean testCompletedSuccessfully = false;
339356
try {
340-
domain = TestUtils.createDomain(domainadminonlyFile);
357+
// domain = TestUtils.createDomain(domainadminonlyFile);TODO
358+
if (VOYAGER) {
359+
Map<String, Object> domainMap = TestUtils.loadYaml(domainadminonlyFile);
360+
domainMap.put("loadBalancer", "VOYAGER");
361+
logger.info("domainadminonlyFile loadBalancer is set to: " + domainMap.get("loadBalancer"));
362+
domain = TestUtils.createDomain(domainMap);
363+
} else {
364+
domain = TestUtils.createDomain(domainadminonlyFile);
365+
}
341366
domain.verifyDomainCreated();
342367

343368
} finally {
@@ -371,7 +396,16 @@ public void testCreateDomainPVReclaimPolicyRecycle() throws Exception {
371396
Domain domain = null;
372397

373398
try {
374-
domain = TestUtils.createDomain(domainrecyclepolicyFile);
399+
// domain = TestUtils.createDomain(domainrecyclepolicyFile); TODO
400+
if (VOYAGER) {
401+
Map<String, Object> domainMap = TestUtils.loadYaml(domainrecyclepolicyFile);
402+
domainMap.put("loadBalancer", "VOYAGER");
403+
logger.info(
404+
"domainrecyclepolicyFile loadBalancer is set to: " + domainMap.get("loadBalancer"));
405+
domain = TestUtils.createDomain(domainMap);
406+
} else {
407+
domain = TestUtils.createDomain(domainrecyclepolicyFile);
408+
}
375409
domain.verifyDomainCreated();
376410
} finally {
377411
if (domain != null) domain.shutdown();
@@ -404,7 +438,16 @@ public void testCreateDomainWithDefaultValuesInSampleInputs() throws Exception {
404438
Domain domain = null;
405439
boolean testCompletedSuccessfully = false;
406440
try {
407-
domain = TestUtils.createDomain(domainsampledefaultsFile);
441+
// domain = TestUtils.createDomain(domainsampledefaultsFile);TODO
442+
if (VOYAGER) {
443+
Map<String, Object> domainMap = TestUtils.loadYaml(domainsampledefaultsFile);
444+
domainMap.put("loadBalancer", "VOYAGER");
445+
logger.info(
446+
"domainsampledefaultsFile loadBalancer is set to: " + domainMap.get("loadBalancer"));
447+
domain = TestUtils.createDomain(domainMap);
448+
} else {
449+
domain = TestUtils.createDomain(domainsampledefaultsFile);
450+
}
408451
domain.verifyDomainCreated();
409452
testBasicUseCases(domain);
410453
// testAdvancedUseCasesForADomain(operator1, domain10);
@@ -449,6 +492,12 @@ public void testAutoAndCustomSitConfigOverrides() throws Exception {
449492
domainMap.put("domainUID", "customsitdomain");
450493
domainMap.put("adminNodePort", new Integer("30704"));
451494
domainMap.put("t3ChannelPort", new Integer("30051"));
495+
if (VOYAGER) {
496+
domainMap.put("loadBalancer", "VOYAGER");
497+
logger.info(
498+
"testAutoAndCustomSitConfigOverrides loadBalancer is set to: "
499+
+ domainMap.get("loadBalancer"));
500+
}
452501
// use NFS for this domain on Jenkins, defaultis HOST_PATH
453502
if (System.getenv("JENKINS") != null && System.getenv("JENKINS").equalsIgnoreCase("true")) {
454503
domainMap.put("weblogicDomainStorageType", "NFS");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ private void callWebAppAndCheckForServerNameInResponse(
939939
}
940940
if (verifyLoadBalancing) {
941941
String response = result.stdout().trim();
942-
logger.info("response: " + response); // TODO remove later!
942+
//logger.info("response: " + response);
943943
for (String key : managedServers.keySet()) {
944944
if (response.contains(key)) {
945945
managedServers.put(key, new Boolean(true));

0 commit comments

Comments
 (0)