Skip to content

Commit 579231d

Browse files
committed
Merge branch 'owls116149' into 'main'
Fix for ItCrossDomainTransaction and ItIstioCrossDomainTransaction failures in 1412 See merge request weblogic-cloud/weblogic-kubernetes-operator!4599
2 parents 8087a7e + 4ba95fc commit 579231d

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,6 @@ private boolean checkLocalQueue() {
536536
hostAndPort);
537537

538538
logger.info("curl command {0}", curlString);
539-
540539
testUntil(
541540
() -> exec(new String(curlString), true).stdout().contains("Messages are distributed"),
542541
logger,
@@ -653,7 +652,8 @@ private static void createDomainResource(String domainUid, String domNamespace,
653652
.name("JAVA_OPTIONS")
654653
.value("-Dweblogic.transaction.EnableInstrumentedTM=true -Dweblogic.StdoutDebugEnabled=false"
655654
+ "-Dweblogic.debug.DebugJTAXA=true "
656-
+ "-Dweblogic.debug.DebugJTA2PC=true"))
655+
+ "-Dweblogic.debug.DebugJTA2PC=true "
656+
+ "-Dweblogic.security.remoteAnonymousRMIT3Enabled=true"))
657657
.addEnvItem(new V1EnvVar()
658658
.name("USER_MEM_ARGS")
659659
.value("-Djava.security.egd=file:/dev/./urandom ")))

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossDomainTransaction.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -635,12 +635,13 @@ private static void createDomainResource(String domainUid, String domNamespace,
635635
.name("JAVA_OPTIONS")
636636
.value("-Dweblogic.transaction.EnableInstrumentedTM=true -Dweblogic.StdoutDebugEnabled=false "
637637
+ "-Dweblogic.debug.DebugJTAXA=true "
638-
+ "-Dweblogic.debug.DebugJTA2PC=true"
638+
+ "-Dweblogic.debug.DebugJTA2PC=true "
639639
+ "-Dweblogic.debug.DebugConnection=true "
640640
+ "-Dweblogic.debug.DebugRouting=true -Dweblogic.debug.DebugMessaging=true "
641641
+ "-Dweblogic.kernel.debug=true -Dweblogic.log.LoggerSeverity=Debug "
642642
+ "-Dweblogic.log.LogSeverity=Debug -Dweblogic.StdoutDebugEnabled=true "
643-
+ "-Dweblogic.log.StdoutSeverity=Debug"))
643+
+ "-Dweblogic.log.StdoutSeverity=Debug "
644+
+ "-Dweblogic.security.remoteAnonymousRMIT3Enabled=true"))
644645
.addEnvItem(new V1EnvVar()
645646
.name("USER_MEM_ARGS")
646647
.value("-Djava.security.egd=file:/dev/./urandom ")))

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMonitoringExporter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ private void setupIstioModelInImageDomain(String miiImage, String domainNamespac
395395
String hostAndPort = getServiceExtIPAddrtOke(istioIngressServiceName, istioNamespace) != null
396396
? getServiceExtIPAddrtOke(istioIngressServiceName, istioNamespace) : host + ":" + istioIngressPort;
397397

398-
String readyAppUrl = "http://" + host + ":" + istioIngressPort + "/weblogic/ready";
398+
String readyAppUrl = "http://" + hostAndPort + "/weblogic/ready";
399399
boolean checlReadyApp =
400400
checkAppUsingHostHeader(readyAppUrl, domainNamespace + ".org");
401401
assertTrue(checlReadyApp, "Failed to access ready app");

integration-tests/src/test/resources/wdt-models/model-cdt-jdbc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resources:
99
InitialCapacity: 0
1010
MinCapacity: 0
1111
MaxCapacity: 15
12-
TestTableName: SQL SELECT 1
12+
TestTableName: SQL SELECT 1 FROM DUAL
1313
JDBCDataSourceParams:
1414
GlobalTransactionsProtocol: TwoPhaseCommit
1515
#GlobalTransactionsProtocol: LoggingLastResource

0 commit comments

Comments
 (0)