Skip to content

Commit b9f4a16

Browse files
committed
added end to end test1
1 parent 6dd40bd commit b9f4a16

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -574,14 +574,17 @@ public void test19_EndToEndViaChart() throws Exception {
574574
createWLSImageAndDeploy();
575575
installPrometheusGrafanaViaChart();
576576
} finally {
577+
577578
uninstallMySQL();
578579
uninstallPrometheusGrafanaViaChart();
579580
String crdCmd =
580581
" kubectl delete -f " + monitoringExporterEndToEndDir + "/demo-domains/domain1.yaml";
581582
ExecCommand.exec(crdCmd);
582583
crdCmd = "kubectl delete secret domain1-weblogic-credentials";
583584
ExecCommand.exec(crdCmd);
584-
operator1.destroy();
585+
if (operator1 != null) {
586+
operator1.destroy();
587+
}
585588
crdCmd =
586589
"cd "
587590
+ monitoringExporterEndToEndDir
@@ -872,8 +875,7 @@ private static void installPrometheusGrafanaViaChart() throws Exception {
872875
+ " -X POST http://admin:12345678@$HOSTNAME:31000/api/dashboards/db/"
873876
+ " --data-binary @grafana/dashboard.json";
874877
TestUtils.exec(crdCmd);
875-
876-
assertTrue(checkMetricsViaPrometheus("wls_servlet_execution_time_average", "testwebapp"));
878+
assertTrue(checkMetricsViaPrometheus("wls_servlet_execution_time_average", "test-webapp"));
877879
}
878880

879881
/**

0 commit comments

Comments
 (0)