Merge remote-tracking branch 'origin/release/4.0'

Author: rjeberhard

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

@@ -686,14 +686,20 @@ private void verifyConfigXMLOverride(boolean configUpdated) {
         + "attributeTest=true"
         + "&serverType=adminserver"
         + "&serverName=" + adminServerName;
-    HttpResponse<String> response = assertDoesNotThrow(() -> OracleHttpClient.get(baseUri + configUri, true));
+    
+    testUntil(() -> {
+      HttpResponse<String> response = assertDoesNotThrow(() -> OracleHttpClient.get(baseUri + configUri, true));
+      if (response.statusCode() != 200) {
+        logger.info("Response code is not 200 retrying...");
+        return false;
+      }
+      if (configUpdated) {
+        return response.body().contains("MaxMessageSize=100000000");
+      } else {
+        return response.body().contains("MaxMessageSize=10000000");
+      }
+    }, logger, "clusterview app in admin server is accessible after restart");
 
-    assertEquals(200, response.statusCode(), "Status code not equals to 200");
-    if (configUpdated) {
-      assertTrue(response.body().contains("MaxMessageSize=100000000"), "Didn't get MaxMessageSize=100000000");
-    } else {
-      assertTrue(response.body().contains("MaxMessageSize=10000000"), "Didn't get MaxMessageSize=10000000");
-    }
 
   }
 
@@ -757,13 +763,25 @@ private void verifyResourceJDBC0Override(boolean configUpdated) {
     */
 
     //test connection pool in all managed servers of dynamic cluster
-    HttpResponse<String> response = null;
     for (int i = 1; i <= replicaCount; i++) {
       appURI = "dsTest=true&dsName=" + dsName0 + "&" + "serverName=" + managedServerNameBase + i;
       String dsConnectionPoolTestUrl = baseUri + appURI;
-      response = assertDoesNotThrow(() -> OracleHttpClient.get(dsConnectionPoolTestUrl, true));
-      assertEquals(200, response.statusCode(), "Status code not equals to 200");
-      assertTrue(response.body().contains("Connection successful"), "Didn't get Connection successful");
+      testUntil(
+          () -> {
+            HttpResponse<String> response = assertDoesNotThrow(() -> OracleHttpClient.get(dsConnectionPoolTestUrl,
+                true));
+            if (response.statusCode() != 200) {
+              logger.info("Response code is not 200 retrying...");
+              return false;
+            }
+            if (!(response.body().contains("Connection successful"))) {
+              logger.info("Didn't get Connection successful retrying...");
+              return false;
+            }
+
+            return true;
+        },
+          logger, "All managed servers get JDBC connection");
     }
   }
 
@@ -967,7 +985,7 @@ private void createDomain() {
     // create cluster object
     ClusterResource cluster = createClusterResource(clusterResName,
         clusterName, domainNamespace, replicaCount);
-    logger.info("Creating cluster resource {0} in namespace {1}",clusterResName, domainNamespace);
+    logger.info("Creating cluster resource {0} in namespace {1}", clusterResName, domainNamespace);
     createClusterAndVerify(cluster);
     // set cluster references
     domain.getSpec().withCluster(new V1LocalObjectReference().name(clusterResName));

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

@@ -46,14 +46,14 @@
 
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
-import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_SECRET_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.GRAFANA_CHART_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
 import static oracle.weblogic.kubernetes.TestConstants.OKD;
 import static oracle.weblogic.kubernetes.TestConstants.PROMETHEUS_CHART_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
+import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
@@ -412,7 +412,7 @@ private void installWebhook() throws ApiException {
     assertTrue(installAndVerifyPodFromCustomImage(monitoringExporterEndToEndDir + "/webhook",
         "webhook",
         webhookNS,
-        labelMap, BASE_IMAGES_REPO_SECRET_NAME), "Failed to start webhook");
+        labelMap, TEST_IMAGES_REPO_SECRET_NAME), "Failed to start webhook");
   }
 
   /**
@@ -487,11 +487,12 @@ public static boolean installAndVerifyPodFromCustomImage(String dockerFileDir,
                                                            String secretName) throws ApiException {
     //build webhook image
     String imagePullPolicy = IMAGE_PULL_POLICY;
+    logger.info("Creating and Installing {0} in namespace {1}", baseImageName, namespace);
     String image = createImageAndPushToRepo(dockerFileDir,baseImageName, namespace, secretName, "");
-    logger.info("Installing {0} in namespace {1}", baseImageName, namespace);
+
     if (baseImageName.equalsIgnoreCase(("webhook"))) {
       webhookImage = image;
-      createWebHook(webhookImage, imagePullPolicy, namespace, BASE_IMAGES_REPO_SECRET_NAME);
+      createWebHook(webhookImage, imagePullPolicy, namespace, TEST_IMAGES_REPO_SECRET_NAME);
     } else if (baseImageName.contains("coordinator")) {
       coordinatorImage = image;
       createCoordinator(coordinatorImage, imagePullPolicy, namespace, "coordsecret");

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

@@ -597,9 +597,9 @@ public static String createImageAndPushToRepo(String dockerFileDir, String baseI
     }
 
     //create registry secret
-    createImageRegistrySecret(BASE_IMAGES_REPO_USERNAME, BASE_IMAGES_REPO_PASSWORD, BASE_IMAGES_REPO_EMAIL,
-            TestConstants.BASE_IMAGES_REPO, secretName, namespace);
-    // login and push image to registry if necessary
+    createImageRegistrySecret(TEST_IMAGES_REPO_USERNAME, TEST_IMAGES_REPO_PASSWORD, TEST_IMAGES_REPO_EMAIL,
+            TestConstants.TEST_IMAGES_REPO, secretName, namespace);
+    // docker login and push image to docker registry if necessary
     imageRepoLoginAndPushImageToRegistry(image);
 
     return image;

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

@@ -16,9 +16,9 @@
 
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
-import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_SECRET_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
+import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
 import static oracle.weblogic.kubernetes.actions.TestActions.getDomainCustomResource;
 import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
@@ -139,7 +139,7 @@ public void initAll(@Namespaces(2) List<String> namespaces, String domainUid) {
     // testMiiRemoveTarget should work fine after the bug is fixed with setDataHome set to true
     DomainResource domain = createDomainResourceWithLogHome(domainUid, domainNamespace,
         MII_BASIC_IMAGE_NAME + ":" + MII_BASIC_IMAGE_TAG,
-        adminSecretName, BASE_IMAGES_REPO_SECRET_NAME, encryptionSecretName, replicaCount,
+        adminSecretName, TEST_IMAGES_REPO_SECRET_NAME, encryptionSecretName, replicaCount,
         pvName, pvcName, configMapName,
         dbSecretName, true, false);