Merge remote-tracking branch 'origin/develop' into cluster-template

Author: rjeberhard

integration-tests/src/test/java/oracle/kubernetes/operator/ItMonitoringExporter.java

@@ -161,7 +161,7 @@ private static void gitCloneMonitoringExporter() throws Exception {
         logger.info(" Cloning and building Weblogic Server Monitoring Exporter application");
         // git clone exporter project
         removeAndClone
-            .append(" git clone  -b alert https://github.com/oracle/weblogic-monitoring-exporter.git ")
+            .append(" git clone  https://github.com/oracle/weblogic-monitoring-exporter.git ")
             .append(monitoringExporterSrcDir);
         TestUtils.exec(removeAndClone.toString());
       }
@@ -825,7 +825,6 @@ public void test19_EndToEndViaChart() throws Exception {
       installPrometheusGrafanaViaChart();
       fireAlert();
     } finally {
-      /*
       uninstallWebHookPrometheusGrafanaViaChart();
       uninstallMysql();
 
@@ -837,8 +836,6 @@ public void test19_EndToEndViaChart() throws Exception {
       if (operator1 != null) {
         operator1.destroy();
       }
-      */
-
     }
     testCompletedSuccessfully = true;
     logger.info("SUCCESS - " + testMethodName);
@@ -855,8 +852,8 @@ private void fireAlert() throws Exception {
 
     TestUtils.checkPodReady("domain1-admin-server", "default");
     TestUtils.checkPodReady("domain1-managed-server-1", "default");
-    //sleep for 1.30 min to fire alert
-    Thread.sleep(90000);
+    //sleep for 2 min to fire alert
+    Thread.sleep(120000);
     String webhookPod = getPodName("webhook", "webhook");
     String command = "kubectl -n webhook logs " + webhookPod;
     ExecResult webhookResult = TestUtils.exec(command);