Merge branch 'sample-fmw' into 'main'

Sample fmw fix

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

Author: rjeberhard

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

@@ -114,7 +114,7 @@ public interface TestConstants {
   String DB_PREBUILT_IMAGE_NAME_DEFAULT = "test-images/database/express";
   String DB_IMAGE_TAG_DEFAULT = "19.3.0.0";
   public static final String DB_IMAGE_TAG_DEFAULT_12C = "12.2.0.1-slim";
-  public static final String DB_PDB_ID_DEFAULT_19C = "orclpdb1";
+  public static final String DB_PDB_ID_DEFAULT_19C = "devpdb";
   public static final String DB_PDB_ID_DEFAULT_12C = "devpdb.k8s";
 
   // repository to push the domain images created during test execution

integration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/InitializationTasks.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes.extensions;
@@ -35,7 +35,6 @@
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
 import oracle.weblogic.kubernetes.utils.ExecCommand;
 import oracle.weblogic.kubernetes.utils.ExecResult;
-import oracle.weblogic.kubernetes.utils.PortInuseEventWatcher;
 import org.awaitility.core.ConditionFactory;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -147,8 +146,6 @@ public class InitializationTasks implements BeforeAllCallback, ExtensionContext.
       .and().with().pollInterval(10, SECONDS)
       .atMost(30, MINUTES).await();
 
-  PortInuseEventWatcher portInuseEventWatcher;
-
   @Override
   public void beforeAll(ExtensionContext context) {
     LoggingFacade logger = getLogger();
@@ -162,8 +159,6 @@ public void beforeAll(ExtensionContext context) {
      */
     if (!started.getAndSet(true)) {
       try {
-        portInuseEventWatcher = new PortInuseEventWatcher();
-        portInuseEventWatcher.start();
         // clean up the download directory so that we always get the latest
         // versions of the WDT and WIT tools in every run of the test suite.
         try {
@@ -450,7 +445,6 @@ public void close() {
     for (Handler handler : logger.getUnderlyingLogger().getHandlers()) {
       handler.close();
     }
-    portInuseEventWatcher.interrupt();
   }
 
   private String getOcirToken() {

kubernetes/samples/scripts/create-oracle-db-service/start-db-service.sh

@@ -33,7 +33,7 @@ pullsecret="docker-store"
 namespace="default"
 pdbid="devpdb.k8s"
 
-while getopts ":a:p:i:s:n:h:l:" opt; do
+while getopts ":a:p:i:s:n:h:" opt; do
   case $opt in
     a) syssecret="${OPTARG}"
     ;;

operator/integration-tests/domain-on-pv/dpv-sample-wrapper/create-secrets.sh

@@ -51,7 +51,8 @@ if [ "$WDT_DOMAIN_TYPE" = "JRF" ]; then
     -d $DOMAIN_UID -n $DOMAIN_NAMESPACE \
     -l rcu_prefix=FMW${CUSTOM_DOMAIN_NAME} \
     -l rcu_schema_password=Oradoc_db1 \
-    -l rcu_db_conn_string=oracle-db.${DB_NAMESPACE}.svc.cluster.local:1521/${DB_PDB_ID}
+    -l rcu_db_conn_string=oracle-db.${DB_NAMESPACE}.svc.cluster.local:1521/${DB_PDB_ID} \
+    -l dba_password=Oradoc_db1
   echo "@@ Info: Creating OPSS wallet password secret (ignored unless domain type is JRF)"
   $WORKDIR/domain-on-pv/utils/create-secret.sh $DRY_RUN -s ${DOMAIN_UID}-opss-wallet-password-secret \
     -d $DOMAIN_UID -n $DOMAIN_NAMESPACE \

operator/integration-tests/domain-on-pv/run-test.sh

@@ -277,9 +277,9 @@ if [ "$DO_DB" = "true" ]; then
 
   doCommand  "\$DBSAMPLEDIR/stop-db-service.sh -n \$DB_NAMESPACE"
   if [ ! -z "$DB_IMAGE_PULL_SECRET" ]; then
-    doCommand  "\$DBSAMPLEDIR/start-db-service.sh -n \$DB_NAMESPACE -i \$DB_IMAGE_NAME:\$DB_IMAGE_TAG -p \$DB_NODE_PORT -l \$DB_PDB_ID -s \$DB_IMAGE_PULL_SECRET"
+    doCommand  "\$DBSAMPLEDIR/start-db-service.sh -n \$DB_NAMESPACE -i \$DB_IMAGE_NAME:\$DB_IMAGE_TAG -p \$DB_NODE_PORT -s \$DB_IMAGE_PULL_SECRET"
   else
-    doCommand  "\$DBSAMPLEDIR/start-db-service.sh -n \$DB_NAMESPACE -i \$DB_IMAGE_NAME:\$DB_IMAGE_TAG -p \$DB_NODE_PORT -l \$DB_PDB_ID"
+    doCommand  "\$DBSAMPLEDIR/start-db-service.sh -n \$DB_NAMESPACE -i \$DB_IMAGE_NAME:\$DB_IMAGE_TAG -p \$DB_NODE_PORT"
   fi
 fi