Merge branch 'okd_42' into 'release/4.2'

Fix for integ tests on OKD

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

Author: rjeberhard

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

@@ -27,6 +27,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
@@ -79,7 +80,6 @@
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.verifyConfiguredSystemResouceByPath;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.verifyConfiguredSystemResource;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withLongRetryPolicy;
-import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withStandardRetryPolicy;
 import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapForDomainCreation;
 import static oracle.weblogic.kubernetes.utils.DomainUtils.checkDomainStatusConditionTypeExists;
 import static oracle.weblogic.kubernetes.utils.DomainUtils.checkDomainStatusConditionTypeHasExpectedStatus;
@@ -304,6 +304,7 @@ WEBLOGIC_IMAGE_TO_USE_IN_SPEC, adminSecretName, createSecretsForImageRepos(domai
    * Verify domain is rolling restarted.
    */
   @Test
+  @Order(1)
   @DisplayName("Test to update data source url in the  domain using auxiliary image")
   @Tag("gate")
   void testUpdateDataSourceInDomainUsingAuxiliaryImage() {
@@ -390,6 +391,7 @@ void testUpdateDataSourceInDomainUsingAuxiliaryImage() {
    * Verify configured JMS and JDBC resources.
    */
   @Test
+  @Order(2)
   @DisplayName("Test to update Base Weblogic Image Name")
   void testUpdateBaseImageName() {
     // get the original domain resource before update
@@ -1559,7 +1561,7 @@ private void checkApplicationIsAccessible(
       int replicaCount, String expectedResponse) {
     for (int i = 1; i <= replicaCount; i++) {
       int index = i;
-      testUntil(withStandardRetryPolicy,
+      testUntil(withLongRetryPolicy,
           () -> appAccessibleInPod(domainNamespace, managedServerPrefixDomain1 + index, "8001",
               "sample-war/index.jsp", expectedResponse + index),
           logger,

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

@@ -54,7 +54,6 @@
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkSystemResourceConfigViaAdminPod;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createIngressHostRouting;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
-import static oracle.weblogic.kubernetes.utils.CommonTestUtils.verifySystemResourceConfiguration;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withStandardRetryPolicy;
 import static oracle.weblogic.kubernetes.utils.JobUtils.getIntrospectJobName;
 import static oracle.weblogic.kubernetes.utils.K8sEvents.DOMAIN_FAILED;
@@ -412,14 +411,8 @@ void testMiiChangeDataSourceParameterWithCommitUpdateAndRoll() {
       int adminServiceNodePort
           = getServiceNodePort(helper.domainNamespace, getExternalServicePodName(helper.adminServerPodName), "default");
       assertNotEquals(-1, adminServiceNodePort, "admin server default node port is not valid");
-      if (TestConstants.KIND_CLUSTER
-          && !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
-        assertFalse(checkSystemResourceConfig(helper.adminSvcExtHost, adminServiceNodePort, "JDBCSystemResources",
+      assertFalse(checkSystemResourceConfig(helper.adminSvcExtHost, adminServiceNodePort, "JDBCSystemResources",
             "TestDataSource2"), "Found JDBCSystemResource datasource, should be deleted");
-      } else {
-        verifySystemResourceConfiguration(null, adminServiceNodePort,
-            "JDBCSystemResources", "TestDataSource2", "404", httpHostHeader);
-      }
     }
     logger.info("JDBCSystemResource Datasource is deleted");
 

integration-tests/src/test/java/oracle/weblogic/kubernetes/assertions/impl/Application.java

@@ -109,6 +109,7 @@ public static boolean appAccessibleInPodKubernetesCLI(
         podName,
         port,
         appPath);
+    getLogger().info("The command to access app is: {0}", cmd);
 
     CommandParams params = Command
         .defaultCommandParams()