Merge branch 'fixserverstartpolicyclustertests' into 'main'

Fix ServerStartPolicy test failures on nightly

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

Author: rjeberhard

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

@@ -23,8 +23,6 @@
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.isPodRestarted;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkClusterReplicaCountMatches;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
-import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
-import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withLongRetryPolicy;
 import static oracle.weblogic.kubernetes.utils.PatchDomainUtils.patchServerStartPolicy;
 import static oracle.weblogic.kubernetes.utils.PodUtils.checkIsPodRestarted;
 import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodDeleted;
@@ -44,7 +42,6 @@
 import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.STOP_SERVER_SCRIPT;
 import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.checkManagedServerConfiguration;
 import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.executeLifecycleScript;
-import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.isManagedServerConfiguration;
 import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.managedServerNamePrefix;
 import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.prepare;
 import static oracle.weblogic.kubernetes.utils.ServerStartPolicyUtils.restoreEnv;
@@ -126,17 +123,9 @@ void beforeEach() {
         "Could not find standalone managed server from configured cluster");
     logger.info("Found standalone managed server configuratio");
 
-    // Check configured cluster configuration is available
+    // Check configured server pod is ready
     String configServerPodName = domainUid + "-config-cluster-server1";
     checkPodReadyAndServiceExists(configServerPodName, domainUid, domainNamespace);
-
-    testUntil(
-            withLongRetryPolicy,
-            isManagedServerConfiguration("config-cluster-server1", domainNamespace, adminServerPodName),
-            logger,
-            "Waiting until managed server from configured cluster found");
-
-    logger.info("Found managed server from configured cluster");
   }
 
   /**

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

@@ -131,12 +131,11 @@ void beforeEach() {
         "Could not find managed server from configured cluster");
     logger.info("Found managed server from configured cluster");
 
-    // Check standalone server configuration is available
-    boolean isStandaloneServerConfigured =
-        checkManagedServerConfiguration("standalone-managed", domainNamespace, adminServerPodName);
-    assertTrue(isStandaloneServerConfigured,
-        "Could not find standalone managed server from configured cluster");
-    logger.info("Found standalone managed server configuration");
+    logger.info("Check standalone managed service/pod {0} is created in namespace {1}",
+        domainUid + "-standalone-managed", domainNamespace);
+    checkPodReadyAndServiceExists(domainUid + "-standalone-managed",
+        domainUid, domainNamespace);
+
   }
 
   /**