Skip to content

Commit 1b4e345

Browse files
authored
Merge pull request #1141 from oracle/endtoend
missed some commits
2 parents d287593 + be5c438 commit 1b4e345

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ private static void gitCloneMonitoringExporter() throws Exception {
160160
logger.info(" Cloning and building Weblogic Server Monitoring Exporter application");
161161
// git clone exporter project
162162
removeAndClone
163-
.append(" git clone -b alert https://github.com/oracle/weblogic-monitoring-exporter.git ")
163+
.append(" git clone https://github.com/oracle/weblogic-monitoring-exporter.git ")
164164
.append(monitoringExporterSrcDir);
165165
TestUtils.exec(removeAndClone.toString());
166166
}
@@ -824,7 +824,6 @@ public void test19_EndToEndViaChart() throws Exception {
824824
installPrometheusGrafanaViaChart();
825825
fireAlert();
826826
} finally {
827-
/*
828827
uninstallWebHookPrometheusGrafanaViaChart();
829828
uninstallMySQL();
830829

@@ -836,8 +835,6 @@ public void test19_EndToEndViaChart() throws Exception {
836835
if (operator1 != null) {
837836
operator1.destroy();
838837
}
839-
*/
840-
841838
}
842839
testCompletedSuccessfully = true;
843840
logger.info("SUCCESS - " + testMethodName);
@@ -854,8 +851,8 @@ private void fireAlert() throws Exception {
854851

855852
TestUtils.checkPodReady("domain1-admin-server", "default");
856853
TestUtils.checkPodReady("domain1-managed-server-1", "default");
857-
//sleep for 1.30 min to fire alert
858-
Thread.sleep(90000);
854+
//sleep for 2 min to fire alert
855+
Thread.sleep(120000);
859856
String webhookPod = getPodName("webhook", "webhook");
860857
String command = "kubectl -n webhook logs " + webhookPod;
861858
ExecResult webhookResult = TestUtils.exec(command);

0 commit comments

Comments
 (0)