Skip to content

Commit d9364ca

Browse files
rjeberhardrjeberhard
committed
Merge branch 'pani-1412-fixes' into 'main'
Resolution to failures related WLS1412 Images See merge request weblogic-cloud/weblogic-kubernetes-operator!4595
2 parents 35819a8 + 16f290d commit d9364ca

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItExternalLbTunneling.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,8 @@ private static void createDomainResource(
684684
.serverPod(new ServerPod()
685685
.addEnvItem(new V1EnvVar()
686686
.name("JAVA_OPTIONS")
687-
.value("-Dweblogic.security.SSL.ignoreHostnameVerification=true"))
687+
.value("-Dweblogic.security.SSL.ignoreHostnameVerification=true "
688+
+ "-Dweblogic.security.remoteAnonymousRMIT3Enabled=true"))
688689
.addEnvItem(new V1EnvVar()
689690
.name("USER_MEM_ARGS")
690691
.value("-Djava.security.egd=file:/dev/./urandom ")))

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItExternalNodePortService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,8 @@ private static void createDomainResource(
415415
.serverPod(new ServerPod()
416416
.addEnvItem(new V1EnvVar()
417417
.name("JAVA_OPTIONS")
418-
.value("-Dweblogic.security.SSL.ignoreHostnameVerification=true"))
418+
.value("-Dweblogic.security.SSL.ignoreHostnameVerification=true "
419+
+ "-Dweblogic.security.remoteAnonymousRMIT3Enabled=true"))
419420
.addEnvItem(new V1EnvVar()
420421
.name("USER_MEM_ARGS")
421422
.value("-Djava.security.egd=file:/dev/./urandom ")))

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDomainUpgradeToSecureMode.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,15 @@
4848

4949
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
5050
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
51+
import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_PREFIX;
5152
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_PREFIX;
5253
import static oracle.weblogic.kubernetes.TestConstants.ENCRYPION_PASSWORD_DEFAULT;
5354
import static oracle.weblogic.kubernetes.TestConstants.ENCRYPION_USERNAME_DEFAULT;
5455
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
5556
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_APP_NAME;
5657
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER_PRIVATEIP;
5758
import static oracle.weblogic.kubernetes.TestConstants.SSL_PROPERTIES;
58-
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME;
59+
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME_DEFAULT;
5960
import static oracle.weblogic.kubernetes.actions.ActionConstants.ARCHIVE_DIR;
6061
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
6162
import static oracle.weblogic.kubernetes.actions.ActionConstants.WORK_DIR;
@@ -232,7 +233,7 @@ void testUpgrade1411to1412ProdOff() {
232233

233234
// create auxiliary domain creation image
234235
String auxImage = createAuxImage(auxImageName, auxImageTag, wdtModelFile.toString(), wdtVariableFile.toString());
235-
String baseImage = WEBLOGIC_IMAGE_NAME + ":" + imageTag1411;
236+
String baseImage = BASE_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag1411;
236237
//name of channel available in domain configuration
237238
String channelName = "default";
238239
//create a MII domain resource with the auxiliary image
@@ -315,7 +316,7 @@ void testUpgrade1411to1412ProdOnSecOff() {
315316

316317
// create auxiliary domain creation image
317318
String auxImage = createAuxImage(auxImageName, auxImageTag, wdtModelFile.toString(), wdtVariableFile.toString());
318-
String baseImage = WEBLOGIC_IMAGE_NAME + ":" + imageTag1411;
319+
String baseImage = BASE_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag1411;
319320
//name of channel available in domain configuration
320321
String channelName = "default";
321322
// create auxiliary domain creation image
@@ -398,7 +399,7 @@ void testUpgrade1411to1412ProdOnSecOn() {
398399

399400
// create auxiliary domain creation image
400401
String auxImage = createAuxImage(auxImageName, auxImageTag, wdtModelFile.toString(), wdtVariableFile.toString());
401-
String baseImage = WEBLOGIC_IMAGE_NAME + ":" + imageTag1411;
402+
String baseImage = BASE_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag1411;
402403
//name of channel available in domain configuration
403404
String channelName = "internal-admin";
404405
//create a MII domain resource with the auxiliary image
@@ -483,7 +484,7 @@ void testUpgrade1411to1412ProdOnSecNotConfigured() {
483484

484485
// create auxiliary domain creation image
485486
String auxImage = createAuxImage(auxImageName, auxImageTag, wdtModelFile.toString(), wdtVariableFile.toString());
486-
String baseImage = WEBLOGIC_IMAGE_NAME + ":" + imageTag1411;
487+
String baseImage = BASE_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag1411;
487488
//name of channel available in domain configuration
488489
String channelName = "internal-admin";
489490
//create a MII domain resource with the auxiliary image
@@ -566,13 +567,13 @@ void testUpgrade12214to1412ProdOff() {
566567
Files.writeString(wdtVariableFile, "AdministrationPortEnabled=false\n", StandardOpenOption.APPEND);
567568
});
568569

569-
String auxImageName = DOMAIN_IMAGES_PREFIX + "dci-prod1411off";
570+
String auxImageName = DOMAIN_IMAGES_PREFIX + "dci-prod12214off";
570571
String auxImageTag = getDateAndTimeStamp();
571572
Path wdtModelFile = Paths.get(RESOURCE_DIR, "securemodeupgrade", "upgrade-model_1.yaml");
572573

573574
// create auxiliary domain creation image
574575
String auxImage = createAuxImage(auxImageName, auxImageTag, wdtModelFile.toString(), wdtVariableFile.toString());
575-
String baseImage = WEBLOGIC_IMAGE_NAME + ":" + imageTag12214;
576+
String baseImage = BASE_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag12214;
576577
//name of channel available in domain configuration
577578
String channelName = "default";
578579
//create a MII domain resource with the auxiliary image
@@ -657,7 +658,7 @@ void testUpgrade12214to1412ProdOn() {
657658

658659
// create auxiliary domain creation image
659660
String auxImage = createAuxImage(auxImageName, auxImageTag, wdtModelFile.toString(), wdtVariableFile.toString());
660-
String baseImage = WEBLOGIC_IMAGE_NAME + ":" + imageTag12214;
661+
String baseImage = BASE_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag12214;
661662
//name of channel available in domain configuration
662663
String channelName = "internal-admin";
663664
//create a MII domain resource with the auxiliary image

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiUpdateDomainConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,8 @@ private static DomainResource createDomainResource(
989989
.serverPod(new ServerPod()
990990
.addEnvItem(new V1EnvVar()
991991
.name("JAVA_OPTIONS")
992-
.value("-Dweblogic.StdoutDebugEnabled=false"))
992+
.value("-Dweblogic.StdoutDebugEnabled=false "
993+
+ "-Dweblogic.security.remoteAnonymousRMIT3Enabled=true"))
993994
.addEnvItem(new V1EnvVar()
994995
.name("USER_MEM_ARGS")
995996
.value("-Djava.security.egd=file:/dev/./urandom "))

0 commit comments

Comments
 (0)