Merge branch 'xc-123605' into 'main'

backport MR 4872 to main

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

Author: rjeberhard

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/LoggingExporter.java

@@ -46,6 +46,7 @@
 import static oracle.weblogic.kubernetes.assertions.impl.Kubernetes.isPodReady;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withLongRetryPolicy;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withStandardRetryPolicy;
 import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -103,6 +104,7 @@ public static boolean installElasticsearch(LoggingExporterParams params) {
     logger.info("Check if Elasticsearch deployment {0} is ready in namespace {1}",
         elasticsearchName, namespace);
     testUntil(
+        withLongRetryPolicy,
         Deployment.isReady(elasticsearchName, labels, namespace),
         logger,
         "Elasticsearch deployment {0} to be completed in {1} namespace",
@@ -170,6 +172,7 @@ public static boolean installKibana(LoggingExporterParams params) {
     logger.info("Checking if Kibana deployment is ready {0} completed in namespace {1}",
         kibanaName, namespace);
     testUntil(
+        withLongRetryPolicy,
         Deployment.isReady(kibanaName, labels, namespace),
         logger,
         "Kibana deployment {0} to be completed in namespace {1}",

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

@@ -1114,7 +1114,7 @@ public static String readRuntimeResource(String adminSvcExtHost, String domainNa
         e.printStackTrace();
       }
     } else {
-      if (OKE_CLUSTER_PRIVATEIP) {
+      if (OKE_CLUSTER_PRIVATEIP || OCNE) {
         String protocol = "http";
         String port = "7001";