Merge branch 'xc-126555' into 'release/4.2'

Fix for FMW sample DB creation failure in nightly runs

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

Author: rjeberhard

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2023, Oracle and/or its affiliates.
+// Copyright (c) 2023, 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;
@@ -31,6 +31,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.BUSYBOX_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TAG;
+import static oracle.weblogic.kubernetes.TestConstants.DB_PDB_ID_DEFAULT_19C;
 import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
 import static oracle.weblogic.kubernetes.TestConstants.IMAGE_NAME_OPERATOR;
@@ -63,6 +64,7 @@
 import static oracle.weblogic.kubernetes.utils.SampleUtils.createPVHostPathAndChangePermissionInKindCluster;
 import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test and verify Domain on PV FMW domain sample.
@@ -141,6 +143,7 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
     envMap.put("OPER_IMAGE_NAME", TEST_IMAGES_PREFIX + IMAGE_NAME_OPERATOR);
     envMap.put("DOMAIN_CREATION_IMAGE_NAME", TEST_IMAGES_PREFIX + DOMAIN_CREATION_IMAGE_NAME);
     envMap.put("DB_IMAGE_PULL_SECRET", BASE_IMAGES_REPO_SECRET_NAME);
+    envMap.put("DB_PDB_ID", DB_PDB_ID_DEFAULT_19C);
 
     // kind cluster uses openjdk which is not supported by image tool
     if (WIT_JAVA_HOME != null) {
@@ -181,7 +184,7 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
   @Order(1)
   public void testInstallOperator() {
     String backupReports = backupReports(UniqueName.uniqueName(this.getClass().getSimpleName()));
-    execTestScriptAndAssertSuccess("-oper", "Failed to run -oper");
+    assertTrue(execTestScriptAndAssertSuccess("-oper", "Failed to run -oper"));
     restoreReports(backupReports);
   }
 
@@ -191,7 +194,8 @@ public void testInstallOperator() {
   @Test
   @Order(2)
   public void testInstallTraefik() {
-    execTestScriptAndAssertSuccess("-traefik", "Failed to run -traefik");
+    Assumptions.assumeTrue(previousTestSuccessful);
+    assertTrue(execTestScriptAndAssertSuccess("-traefik", "Failed to run -traefik"));
   }
 
   /**
@@ -200,7 +204,8 @@ public void testInstallTraefik() {
   @Test
   @Order(3)
   public void testPrecleandb() {
-    execTestScriptAndAssertSuccess("-precleandb", "Failed to run -precleandb");
+    Assumptions.assumeTrue(previousTestSuccessful);
+    assertTrue(execTestScriptAndAssertSuccess("-precleandb", "Failed to run -precleandb"));
   }
 
   /**
@@ -209,25 +214,38 @@ public void testPrecleandb() {
   @Test
   @Order(4)
   public void testCreatedb() {
+    Assumptions.assumeTrue(previousTestSuccessful);
     logger.info("test case for creating a db");
     if (KIND_REPO != null) {
       String dbimage = DB_IMAGE_NAME + ":" + DB_IMAGE_TAG;
       logger.info("loading image {0} to kind", dbimage);
       imagePush(dbimage);
     }
-    execTestScriptAndAssertSuccess("-db", "Failed to run -db");
+    assertTrue(execTestScriptAndAssertSuccess("-db", "Failed to run -db"));
   }
 
   /**
-   * Test Domain on PV sample building image for FMW domain use case.
+   * Test Domain on PV sample - Initialize schemas in the DB.
    */
   @Test
   @Order(5)
+  public void testCreateRCU() {
+    Assumptions.assumeTrue(previousTestSuccessful);
+    logger.info("test case for initializing schemas in the DB");
+    assertTrue(execTestScriptAndAssertSuccess("-rcu", "Failed to run -rcu"));
+  }
+  
+  /**
+   * Test Domain on PV sample building image for FMW domain use case.
+   */
+  @Test
+  @Order(6)
   public void testInitialImage() {
+    Assumptions.assumeTrue(previousTestSuccessful);
     logger.info("test case for building image");
     imagePull(BUSYBOX_IMAGE + ":" + BUSYBOX_TAG);
     imageTag(BUSYBOX_IMAGE + ":" + BUSYBOX_TAG, "busybox");
-    execTestScriptAndAssertSuccess("-initial-image", "Failed to run -initial-image");
+    assertTrue(execTestScriptAndAssertSuccess("-initial-image", "Failed to run -initial-image"));
     ExecResult result = Command.withParams(
         new CommandParams()
             .command(WLSIMG_BUILDER + " images")
@@ -247,8 +265,9 @@ public void testInitialImage() {
    * Test Domain on PV sample create FMW domain use case.
    */
   @Test
-  @Order(6)
+  @Order(7)
   public void testInitialMain() {
+    Assumptions.assumeTrue(previousTestSuccessful);
     logger.info("test case for creating a FMW domain");
 
     // load the base image to kind if using kind cluster
@@ -262,7 +281,7 @@ public void testInitialMain() {
         withLongRetryPolicy,
         checkTestScriptAndAssertSuccess("-initial-main", "Failed to run -initial-main"),
         logger,
-        "create PV HostPath and change Permission in Kind Cluster");
+        "creating FMW domain");
   }
 
   /**
@@ -273,7 +292,6 @@ public void testInitialMain() {
   private boolean execTestScriptAndAssertSuccess(String arg,
                                                  String errString) {
 
-    Assumptions.assumeTrue(previousTestSuccessful);
     previousTestSuccessful = false;
 
     String command = domainOnPvSampleScript
@@ -293,14 +311,14 @@ private boolean execTestScriptAndAssertSuccess(String arg,
             && result.stdout() != null
             && result.stdout().contains("Finished without errors");
 
-    String outStr = errString;
-    outStr += ", command=\n{\n" + command + "\n}\n";
+    String outStr = success ? "Running test script succeeds: " : errString + ":";
+    outStr += " command=\n{\n" + command + "\n}\n";
     outStr += ", stderr=\n{\n" + (result != null ? result.stderr() : "") + "\n}\n";
     outStr += ", stdout=\n{\n" + (result != null ? result.stdout() : "") + "\n}\n";
 
     logger.info("output String is: {0}", outStr);
 
-    previousTestSuccessful = true;
+    previousTestSuccessful = success;
 
     return success;
   }

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

@@ -114,6 +114,9 @@ public interface TestConstants {
   public static final String DB_IMAGE_NAME_DEFAULT = "test-images/database/enterprise";
   public static final String DB_PREBUILT_IMAGE_NAME_DEFAULT = "test-images/database/express";
   public static final 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_12C = "devpdb.k8s";
 
   // repository to push the domain images created during test execution
   // (a) for kind cluster push to kind repo

kubernetes/samples/scripts/create-oracle-db-service/common/oracle.db.19plus.yaml

@@ -0,0 +1,81 @@
+# Copyright (c) 2025, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: oracle-db
+  namespace: default
+spec:
+  ports:
+  - name: tns
+    port: 1521
+    protocol: TCP
+    targetPort: 1521
+    nodePort: 30011
+  selector:
+    app.kubernetes.io/instance: dev
+    app.kubernetes.io/name: oracle-db
+  sessionAffinity: None
+  type: LoadBalancer
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: oracle-db
+  namespace: default
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance: dev
+      app.kubernetes.io/name: oracle-db
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/instance: dev
+        app.kubernetes.io/name: oracle-db
+    spec:
+      containers:
+      - env:
+        - name: ORACLE_SID
+          value: ORCLCDB
+        - name: ORACLE_PDB
+          value: ORCLPDB1
+        - name: DB_DOMAIN
+          value: k8s
+        - name: DB_BUNDLE
+          value: basic  
+        - name: ORACLE_PWD
+          valueFrom:
+            secretKeyRef:
+              name: oracle-db-secret
+              key: password
+        image: container-registry.oracle.com/database/enterprise:19.3.0.0
+        imagePullPolicy: IfNotPresent
+        name: oracle-db
+        ports:
+        - containerPort: 1521
+          name: tns
+          protocol: TCP
+        resources:
+          requests:
+            cpu: "2" 
+            memory: "24Gi"
+          limits:
+            cpu: "4"
+            memory: "40Gi"
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      securityContext: {}
+      terminationGracePeriodSeconds: 30
+      imagePullSecrets:
+           - name: docker-store

kubernetes/samples/scripts/create-oracle-db-service/common/oracle.db.yaml

@@ -1,3 +1,6 @@
+# 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.
+
 apiVersion: v1
 kind: Service
 metadata:

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

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2019, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2019, 2025, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # Bring up Oracle DB Instance in [default] NameSpace with a NodePort Service 
@@ -9,7 +9,7 @@ scriptDir="$( cd "$( dirname "${script}" )" && pwd )"
 source ${scriptDir}/../common/utility.sh
 
 usage() {
-  echo "usage: ${script} [-a <dbasecret>] [-p <nodeport>] [-i <image>] [-s <pullsecret>] [-n <namespace>] [-h]"
+  echo "usage: ${script} [-a <dbasecret>] [-p <nodeport>] [-i <image>] [-s <pullsecret>] [-n <namespace>] [-l <pdb_id>] [-h]"
   echo "  -a DB Sys Account Password Secret Name (optional)"
   echo "      (default: oracle-db-secret, secret must include a key named 'password')"
   echo "      If this secret is not deployed, then the database will not successfully deploy."
@@ -22,6 +22,7 @@ usage() {
   echo "      If this secret is not deployed, then Kubernetes will try pull anonymously."
   echo "  -n Configurable Kubernetes NameSpace for Oracle DB Service (optional)"
   echo "      (default: default) "
+  echo "  -l db pdb id for Oracle DB service (optional, default: devpdb.k8s)"
   echo "  -h Help"
   exit $1
 }
@@ -31,8 +32,9 @@ nodeport=30011
 dbimage="container-registry.oracle.com/database/enterprise:12.2.0.1-slim"
 pullsecret="docker-store"
 namespace="default"
+pdbid="devpdb.k8s"
 
-while getopts ":a:p:i:s:n:h:" opt; do
+while getopts ":a:p:i:s:n:h:l:" opt; do
   case $opt in
     a) syssecret="${OPTARG}"
     ;;
@@ -44,6 +46,8 @@ while getopts ":a:p:i:s:n:h:" opt; do
     ;;
     n) namespace="${OPTARG}"
     ;;
+    l) pdbid="${OPTARG}"
+    ;;
     h) usage 0
     ;;
     *) usage 1
@@ -65,11 +69,20 @@ echo "NodePort[$nodeport] ImagePullSecret[$pullsecret] Image[${dbimage}] NameSpa
 
 #create unique db yaml file if does not exists
 dbYaml=${scriptDir}/common/oracle.db.${namespace}.yaml
+
 if [ ! -f "$dbYaml" ]; then
     echo "$dbYaml does not exist."
-    cp ${scriptDir}/common/oracle.db.yaml ${dbYaml}
+    # Choose template based on dbimage version
+    if echo "$dbimage" | grep -q "12\."; then
+        templateYaml="${scriptDir}/common/oracle.db.yaml"
+    else
+        templateYaml="${scriptDir}/common/oracle.db.19plus.yaml"
+    fi
+    echo "Using template: $templateYaml"
+    cp "$templateYaml" "$dbYaml"
 fi
 
+
 # Modify ImagePullSecret and DatabaseImage based on input
 sed -i -e '$d' ${dbYaml}
 echo '           - name: docker-store' >> ${dbYaml}
@@ -92,6 +105,7 @@ fi
 ${KUBERNETES_CLI:-kubectl} delete service oracle-db -n ${namespace} --ignore-not-found
 
 echo "Applying Kubernetes YAML file '${dbYaml}' to start database."
+cat ${dbYaml}
 ${KUBERNETES_CLI:-kubectl} apply -f ${dbYaml}
 
 detectPod ${namespace}
@@ -107,9 +121,30 @@ checkService oracle-db ${namespace}
 ${KUBERNETES_CLI:-kubectl} get po -n ${namespace}
 ${KUBERNETES_CLI:-kubectl} get service -n ${namespace}
 
-${KUBERNETES_CLI:-kubectl} cp ${scriptDir}/common/checkDbState.sh -n ${namespace} ${dbpod}:/home/oracle/
+logfile="/tmp/setupDB.log"
+max=60
+counter=0
+while [ $counter -le ${max} ]
+do
+ ${KUBERNETES_CLI:-kubectl} logs ${dbpod} -n ${namespace} > $logfile
+ grep -i "DATABASE IS READY" $logfile
+ [[ $? == 0 ]] && break;
+ ((counter++))
+ echo "${KUBERNETES_CLI:-kubectl} describe pod ${dbpod}  -n ${namespace}"
+ ${KUBERNETES_CLI:-kubectl} describe pod ${dbpod}  -n ${namespace}
+ echo "[$counter/${max}] Retrying for Oracle Database Availability..."
+ sleep 60
+done
+
+if [ $counter -gt ${max} ]; then
+ echo "[ERRORR] Oracle DB Service is not ready after [${max}] iterations ..."
+ exit -1
+fi
+
+# for db 19c only
+echo " set sys password "
+${KUBERNETES_CLI:-kubectl} exec -it ${dbpod} -n ${namespace} -- /bin/bash setPassword.sh Oradoc_db1
 
-${KUBERNETES_CLI:-kubectl} exec -it ${dbpod} -n ${namespace} -- /bin/bash /home/oracle/checkDbState.sh
 if [ $? != 0  ]; then
  echo "######################";
  echo "[ERROR] Could not create Oracle DB Service, check the pod log for pod ${dbpod} in namespace ${namespace}";
@@ -122,4 +157,4 @@ if [ ! "${nodeport}" = "none" ]; then
 else
   echo "Oracle DB Service is RUNNING and does not specify a public NodePort"
 fi
-echo "Oracle DB Service URL [oracle-db.${namespace}.svc.cluster.local:1521/devpdb.k8s]"
+echo "Oracle DB Service URL [oracle-db.${namespace}.svc.cluster.local:1521/${pdbid}]"

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

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 #
@@ -15,7 +15,7 @@
 # Optional environment variables (see README for details):
 #
 #   WORKDIR, DOMAIN_UID, DOMAIN_NAMESPACE, WDT_DOMAIN_TYPE,
-#   DB_NAMESPACE, INCLUDE_DOMAIN_CREATION_CONFIGMAP, CORRECTED_DATASOURCE_SECRET,
+#   DB_NAMESPACE, DB_PDB_ID, INCLUDE_DOMAIN_CREATION_CONFIGMAP, CORRECTED_DATASOURCE_SECRET,
 #   KUBERNETES_CLI
 
 set -eu
@@ -51,7 +51,7 @@ 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/devpdb.k8s
+    -l rcu_db_conn_string=oracle-db.${DB_NAMESPACE}.svc.cluster.local:1521/${DB_PDB_ID}
   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 \
@@ -84,5 +84,5 @@ if [ "${INCLUDE_DOMAIN_CREATION_CONFIGMAP}" = "true" ]; then
     -l "user=sys as sysdba" \
     -l password=$dspw \
     -l max-capacity=$dscap \
-    -l url=jdbc:oracle:thin:@oracle-db.${DB_NAMESPACE}.svc.cluster.local:1521/devpdb.k8s
+    -l url=jdbc:oracle:thin:@oracle-db.${DB_NAMESPACE}.svc.cluster.local:1521/${DB_PDB_ID}
 fi