Merge branch 'create-db-port' into 'main'

porting the changes from 4.2 for DB creation failure in samples

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

Author: jshum2479

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

@@ -6,6 +6,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Callable;
 
 import oracle.weblogic.kubernetes.actions.impl.UniqueName;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
@@ -30,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;
@@ -45,6 +47,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_REGISTRY;
 import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_RELEASE_NAME;
+import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WDT_DOWNLOAD_URL;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WIT_DOWNLOAD_URL;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WIT_JAVA_HOME;
@@ -54,6 +57,8 @@
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.backupReports;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.restoreReports;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withLongRetryPolicy;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
 import static oracle.weblogic.kubernetes.utils.SampleUtils.createPVHostPathAndChangePermissionInKindCluster;
@@ -87,7 +92,7 @@ class ItFmwDomainOnPVSample {
    *        JUnit engine parameter resolution mechanism
    */
   @BeforeAll
-  static void initAll(@Namespaces(4) List<String> namespaces) {
+  public static void initAll(@Namespaces(4) List<String> namespaces) {
     logger = getLogger();
 
     // get a new unique opNamespace
@@ -138,6 +143,7 @@ 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) {
@@ -176,9 +182,9 @@ static void initAll(@Namespaces(4) List<String> namespaces) {
    */
   @Test
   @Order(1)
-  void testInstallOperator() {
+  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);
   }
 
@@ -187,44 +193,66 @@ void testInstallOperator() {
    */
   @Test
   @Order(2)
-  void testInstallTraefik() {
-    execTestScriptAndAssertSuccess("-traefik", "Failed to run -traefik");
+  public void testInstallTraefik() {
+    Assumptions.assumeTrue(previousTestSuccessful);
+    assertTrue(execTestScriptAndAssertSuccess("-traefik", "Failed to run -traefik"));
   }
 
   /**
    * Test Domain on PV sample precleandb use case.
    */
   @Test
   @Order(3)
-  void testPrecleandb() {
-    execTestScriptAndAssertSuccess("-precleandb", "Failed to run -precleandb");
+  public void testPrecleandb() {
+    Assumptions.assumeTrue(previousTestSuccessful);
+    assertTrue(execTestScriptAndAssertSuccess("-precleandb", "Failed to run -precleandb"));
   }
 
   /**
    * Test Domain on PV sample create db use case.
    */
   @Test
   @Order(4)
-  void testCreatedb() {
+  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)
-  void testInitialImage() {
+  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")
+            .env(envMap)
+            .redirect(true)
+    ).executeAndReturnResult();
+    logger.info(result.stdout());
 
     // load the image to kind if using kind cluster
     String imageCreated;
@@ -237,8 +265,9 @@ void testInitialImage() {
    * Test Domain on PV sample create FMW domain use case.
    */
   @Test
-  @Order(6)
-  void testInitialMain() {
+  @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
@@ -248,18 +277,21 @@ void testInitialMain() {
       createPVHostPathAndChangePermissionInKindCluster("/shared", envMap);
     }
 
-    execTestScriptAndAssertSuccess("-initial-main", "Failed to run -initial-main");
+    testUntil(
+        withLongRetryPolicy,
+        checkTestScriptAndAssertSuccess("-initial-main", "Failed to run -initial-main"),
+        logger,
+        "creating FMW domain");
   }
 
   /**
    * Run script run-test.sh.
    * @param arg arguments to execute script
    * @param errString a string of detailed error
    */
-  private void execTestScriptAndAssertSuccess(String arg,
+  private boolean execTestScriptAndAssertSuccess(String arg,
                                                  String errString) {
 
-    Assumptions.assumeTrue(previousTestSuccessful);
     previousTestSuccessful = false;
 
     String command = domainOnPvSampleScript
@@ -273,27 +305,33 @@ private void execTestScriptAndAssertSuccess(String arg,
             .redirect(true)
     ).executeAndReturnResult();
 
-    boolean success = result != null
+    boolean success =
+        result != null
             && result.exitValue() == 0
             && 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 = success;
-    assertTrue(success, "running test script " + arg + " failed");
+
+    return success;
+  }
+
+  private Callable<Boolean> checkTestScriptAndAssertSuccess(String arg, String errString) {
+    return () -> execTestScriptAndAssertSuccess(arg, errString);
   }
 
   /**
    * Delete DB deployment for FMW test cases and Uninstall Traefik.
    */
   @AfterAll
-  static void tearDownAll() {
+  public static void tearDownAll() {
     logger = getLogger();
 
     // uninstall Traefik

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

@@ -113,6 +113,9 @@ public interface TestConstants {
   String DB_IMAGE_NAME_DEFAULT = "test-images/database/enterprise";
   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_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