Merge branch 'xc-123748' into 'main'

backport MR 4881 to main

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

Author: jshum2479

Jenkinsfile.ocne19

@@ -14,7 +14,7 @@ pipeline {
     }
     triggers {
         // timer trigger for "nightly build"
-        parameterizedCron(env.JOB_NAME == 'wko-ocne19-release42-nightly' ?
+        parameterizedCron(env.JOB_NAME == 'wko-ocne19-main-nightly' ?
         CRON_SETTINGS : '')
     }
 
@@ -60,8 +60,8 @@ pipeline {
         wle_download_url="https://github.com/oracle/weblogic-logging-exporter/releases/latest"
 
         kubeconfig_file = "${WORKSPACE}/terraform/terraform/1.9/kubeconfig"
-        availability_domain = "${env.JOB_NAME == 'wko-ocne19-release42-nightly' ? 'mFEn:PHX-AD-1' : 'mFEn:PHX-AD-1'}"
-        PARALLEL_RUN = "${env.JOB_NAME == 'wko-ocne19-release42-nightly' ? true : false}"
+        availability_domain = "${env.JOB_NAME == 'wko-ocne19-main-nightly' ? 'mFEn:PHX-AD-1' : 'mFEn:PHX-AD-1'}"
+        PARALLEL_RUN = "${env.JOB_NAME == 'wko-ocne19-main-nightly' ? true : false}"
     }
 
     parameters {
@@ -72,7 +72,7 @@ pipeline {
         )
 
         choice(name: 'MAVEN_PROFILE_NAME',
-                description: 'Profile to use in mvn command to run the tests.  Possible values are olcne (the default), wko-olcne-cert and integration-tests. Refer to weblogic-kubernetes-operator/integration-tests/pom.xml on the branch.',
+                description: 'Profile to use in mvn command to run the tests.  Possible values are olcne-srg (the default), olcne-mrg, olcne-sequential and integration-tests. Refer to weblogic-kubernetes-operator/integration-tests/pom.xml on the branch.',
                 choices: [
                         'olcne-srg',
                         'olcne-mrg',

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

@@ -41,6 +41,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
 import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
+import static oracle.weblogic.kubernetes.TestConstants.OCNE;
 import static oracle.weblogic.kubernetes.TestConstants.OKD;
 import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
@@ -127,7 +128,7 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
     ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
     dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX;
 
-    if (OKD) {
+    if (OKD || OCNE) {
       logger.info("Start DB and create RCU schema for namespace: {0}, dbListenerPort: {1}, RCU prefix: {2}, "
           + "dbUrl: {3}, dbImage: {4},  fmwImage: {5} ", dbNamespace, dbListenerPort, RCUSCHEMAPREFIX, dbUrl,
           DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);

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

@@ -54,6 +54,7 @@
 import static oracle.weblogic.kubernetes.utils.ClusterUtils.createClusterAndVerify;
 import static oracle.weblogic.kubernetes.utils.ClusterUtils.createClusterResource;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
 import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
 import static oracle.weblogic.kubernetes.utils.DomainUtils.shutdownDomainAndVerify;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
@@ -544,12 +545,21 @@ private void createVerifyDomain(DomainResource domain) {
 
   // get pod log which includes the server.out logs and verify the messages contain the set shutdown properties
   private void verifyServerLog(String namespace, String podName, String[] envVars) {
-    String podLog = assertDoesNotThrow(() -> TestActions.getPodLog(podName, namespace));
-    for (String envVar : envVars) {
-      logger.info("Checking Pod {0} for server startup property {1}", podName, envVar);
-      assertTrue(podLog.contains(envVar), "Server log doesn't contain the " + envVar);
-      logger.info("Pod {0} contains the property {1} in server startup env", podName, envVar);
-    }
+    testUntil(
+        () -> {
+          boolean result = true;
+          String podLog = assertDoesNotThrow(() -> TestActions.getPodLog(podName, namespace));
+          for (String envVar : envVars) {
+            logger.info("Checking Pod {0} for server startup property {1}", podName, envVar);
+            result = result && podLog.contains(envVar);
+          }
+          return result;
+        },
+        logger,
+        "server log for pod {0} contains environment variables {1}",
+        podName,
+        envVars
+    );
   }
 
   // Crate a ConfigMap with a model to add a 2 independent managed servers
@@ -570,6 +580,5 @@ private static void createModelConfigMap(String configMapName, String model) {
         String.format("Can't create ConfigMap %s", configMapName));
     assertTrue(cmCreated, String.format("createConfigMap failed %s", configMapName));
   }
-
 }
 

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

@@ -33,6 +33,7 @@
 import static oracle.weblogic.kubernetes.actions.TestActions.listPods;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.jobCompleted;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withLongRetryPolicy;
 import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createfixPVCOwnerContainer;
 import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -156,6 +157,7 @@ public static void createDomainJob(String image, String pvName, String pvcName,
     logger.info("Checking if the domain creation job {0} completed in namespace {1}",
         jobName, namespace);
     testUntil(
+        withLongRetryPolicy,
         jobCompleted(jobName, null, namespace),
         logger,
         "job {0} to be completed in namespace {1}",