Merge branch 'elk-debug-r40' into 'release/4.0'

backport the fix for the failure of testOpLogLevelSearch in ItElasticLogging and ItElasticLoggingSample on Jenkin Run to release/4.0

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

Author: rjeberhard

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

@@ -54,7 +54,7 @@
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.operatorIsReady;
 import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.createMiiDomainAndVerify;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
-import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withStandardRetryPolicy;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withLongRetryPolicy;
 import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.configMapExist;
 import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapFromFiles;
 import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.replaceConfigMap;
@@ -279,7 +279,7 @@ void testLogLevelSearch() {
     String queryCriteria = "/_count?q=level:INFO";
 
     // verify log level query results
-    withStandardRetryPolicy.untilAsserted(
+    withLongRetryPolicy.untilAsserted(
         () -> assertTrue(verifyCountsHitsInSearchResults(queryCriteria, regex, LOGSTASH_INDEX_KEY, true),
             "Query logs of level=INFO failed"));
 
@@ -297,9 +297,13 @@ void testOperatorLogSearch() {
     String regex = ".*took\":(\\d+),.*hits\":\\{(.+)\\}";
     String queryCriteria = "/_search?q=type:weblogic-operator";
 
-    verifyCountsHitsInSearchResults(queryCriteria, regex, LOGSTASH_INDEX_KEY, false);
+    // verify results of query of type:weblogic-operator in Operator log
+    withLongRetryPolicy.untilAsserted(
+        () -> assertTrue(verifyCountsHitsInSearchResults(queryCriteria, regex, LOGSTASH_INDEX_KEY, false),
+            "Query Operator log info q=type:weblogic-operator failed"));
 
-    logger.info("Query Operator log info succeeded");
+
+    logger.info("Query Operator log info q=type:weblogic-operator succeeded");
   }
 
   /**
@@ -431,7 +435,7 @@ private static  void createAndVerifyDomain(String miiImage) {
 
   private void verifyServerRunningInSearchResults(String serverName) {
     String queryCriteria = "/_search?q=log:" + serverName;
-    withStandardRetryPolicy.untilAsserted(
+    withLongRetryPolicy.untilAsserted(
         () -> assertTrue(execSearchQuery(queryCriteria, LOGSTASH_INDEX_KEY).contains("RUNNING"),
           String.format("serverName %s is not RUNNING", serverName)));
 
@@ -539,7 +543,7 @@ private void verifyLogstashConfigMapModifyResult(String replaceStr) {
     }
 
     // wait for logstash config modified and verify
-    withStandardRetryPolicy.untilAsserted(
+    withLongRetryPolicy.untilAsserted(
         () -> assertTrue(copyConfigFromPodAndSearchForString(containerName, replaceStr),
             String.format("Failed to find search string %s", replaceStr)));
   }