File tree Expand file tree Collapse file tree 1 file changed +5
-3
lines changed
integration-tests/src/test/java/oracle/kubernetes/operator Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -574,14 +574,17 @@ public void test19_EndToEndViaChart() throws Exception {
574
574
createWLSImageAndDeploy ();
575
575
installPrometheusGrafanaViaChart ();
576
576
} finally {
577
+
577
578
uninstallMySQL ();
578
579
uninstallPrometheusGrafanaViaChart ();
579
580
String crdCmd =
580
581
" kubectl delete -f " + monitoringExporterEndToEndDir + "/demo-domains/domain1.yaml" ;
581
582
ExecCommand .exec (crdCmd );
582
583
crdCmd = "kubectl delete secret domain1-weblogic-credentials" ;
583
584
ExecCommand .exec (crdCmd );
584
- operator1 .destroy ();
585
+ if (operator1 != null ) {
586
+ operator1 .destroy ();
587
+ }
585
588
crdCmd =
586
589
"cd "
587
590
+ monitoringExporterEndToEndDir
@@ -872,8 +875,7 @@ private static void installPrometheusGrafanaViaChart() throws Exception {
872
875
+ " -X POST http://admin:12345678@$HOSTNAME:31000/api/dashboards/db/"
873
876
+ " --data-binary @grafana/dashboard.json" ;
874
877
TestUtils .exec (crdCmd );
875
-
876
- assertTrue (checkMetricsViaPrometheus ("wls_servlet_execution_time_average" , "testwebapp" ));
878
+ assertTrue (checkMetricsViaPrometheus ("wls_servlet_execution_time_average" , "test-webapp" ));
877
879
}
878
880
879
881
/**
You can’t perform that action at this time.
0 commit comments