Merge branch 'OWLS-123702' into 'release/4.2'

Add cross domain transaction tests with JMS provider in K8s and JMS client in on prem domain

See merge request weblogic-cloud/weblogic-kubernetes-operator!4893

Author: rjeberhard

Jenkinsfile.podman

@@ -469,6 +469,8 @@ nodes:
         hostPort: 2228
       - containerPort: 31132
         hostPort: 8001
+      - containerPort: 31136
+        hostPort: 2232
     extraMounts:
       - hostPath: ${pv_root}
         containerPath: ${pv_root}

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

@@ -571,5 +571,7 @@ public interface TestConstants {
 
   public static final int IT_ONPREMCRDOMAINTX_INGRESS_HTTP_NODEPORT = 31132;
   public static final int IT_ONPREMCRDOMAINTX_INGRESS_HTTP_HOSTPORT = 8001;
+  public static final int IT_ONPREMCRDOMAINTX_CLUSTER_NODEPORT = 31136;
+  public static final int IT_ONPREMCRDOMAINTX_CLUSTER_HOSTPORT = 2232;
 
 }

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

@@ -244,6 +244,7 @@ public boolean archiveApp() {
     List<String> srcFiles  = params.srcDirList();
     String srcFile = srcFiles.get(0);
     String appName = srcFile.substring(srcFile.lastIndexOf("/") + 1, srcFile.lastIndexOf("."));
+    params.appName(appName);
     String archiveSrcDir = params.appArchiveDir() + "/wlsdeploy/applications";
 
     try {

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/AppBuilder.java

@@ -496,8 +496,8 @@ public static void replaceStringInFile(String filePath, String regex, String rep
     Path src = Paths.get(filePath);
     logger.info("Replacing {0} in {1} with {2}", regex, src.toString(), replacement);
     String content = new String(Files.readAllBytes(src), StandardCharsets.UTF_8);
-    if (!content.contains(regex)) {
-      logger.info("search string {0} not found to replace with {1}", regex, replacement);
+    if (!content.matches(regex)) {
+      logger.warning("search string {0} not found to replace with {1}", regex, replacement);
     }
     long oldModified = src.toFile().lastModified();
     Files.write(src, content.replaceAll(regex, replacement).getBytes(StandardCharsets.UTF_8));

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/FileUtils.java

@@ -79,7 +79,9 @@ public void onMessage (Message msg) {
 
     ConnectionFactory 
        cf=(ConnectionFactory)cxt.lookup("weblogic.jms.ConnectionFactory");
+    System.out.println("<TMDB> weblogic.jms.ConnectionFactory lookup successful in local domain");
     Destination rq=(Destination)cxt.lookup("jms.testAccountingQueue");
+    System.out.println("<TMDB> jms.testAccountingQueue lookup successful in local domain");
     JMSContext context = cf.createContext();
     tmsg = context.createTextMessage("(On Server) " + serverRuntime.getName());
     context.createProducer().send(rq,tmsg);

integration-tests/src/test/resources/apps/mdbtopic/src/application/MdbTopic.java

@@ -0,0 +1,13 @@
+# Copyright (c) 2024, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+hostname=sys.argv[1]
+connect('weblogic','welcome1','t3://'+hostname+':7001')
+serverRuntime()
+cd('JMSRuntime/admin-server.jms/JMSServers/TestAdminJmsServer/Destinations/TestAdminJmsModule!testAccountingQueue')
+ls()
+count=cmo.getMessagesCurrentCount()
+print 'messagesgot='+str(count)
+disconnect()
+exit()
+

integration-tests/src/test/resources/onpremcrtx/getmessages.py

@@ -4,4 +4,3 @@
 DOMAIN_NAME=domain1
 ADMIN_USERNAME=weblogic
 ADMIN_PASSWORD=welcome1
-

integration-tests/src/test/resources/onpremcrtx/model-crossdomaintransaction-domain1.properties

@@ -16,7 +16,7 @@ topology:
         ServerNamePrefix: "managed-server"
         DynamicClusterSize: 2
         MaxDynamicClusterSize: 2
-        CalculatedListenPorts: false
+        CalculatedListenPorts: '@@PROP:CALCULATED_LISTENPORTS@@'
   Server:
     "admin-server":
       ListenPort: 7001

integration-tests/src/test/resources/onpremcrtx/model-crossdomaintransaction-domain1.yaml

@@ -0,0 +1,38 @@
+# Copyright (c) 2024, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+domainInfo:
+  AdminUserName: '@@PROP:ADMIN_USERNAME@@'
+  AdminPassword: '@@PROP:ADMIN_PASSWORD@@'
+  ServerStartMode: 'prod'
+
+topology:
+  Name: '@@PROP:DOMAIN_NAME@@'
+  AdminServerName: "admin-server"
+  Cluster:
+    "cluster-1":
+      DynamicServers:
+        ServerTemplate:  "cluster-1-template"
+        ServerNamePrefix: "managed-server"
+        DynamicClusterSize: 2
+        MaxDynamicClusterSize: 2
+        CalculatedListenPorts: '@@PROP:CALCULATED_LISTENPORTS@@'
+  Server:
+    "admin-server":
+      ListenPort: 7001
+  ServerTemplate:
+    "cluster-1-template":
+      Cluster: "cluster-1"
+      ListenPort : 9001
+      NetworkAccessPoint:
+        MyT3Channel:
+          Protocol: 't3'
+          ListenPort: 7999
+          PublicPort: '@@PROP:PUBLIC_LB_PORT@@'
+          PublicAddress: '@@PROP:PUBLIC_LB_ADDRESS@@'
+          HttpEnabledForThisProtocol: true
+          TunnelingEnabled: true
+          OutboundEnabled: false
+          Enabled: true
+          TwoWaySSLEnabled: false
+          ClientCertificateEnforced: false