Skip to content

Commit ad9cf71

Browse files
authored
Updated tests to use 2.1.1 Monitoring Exporter version (#3869)
* Updated tests to use 2.1.1 Monitoring Exporter version
1 parent 192e946 commit ad9cf71

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.weblogic.kubernetes;
@@ -276,7 +276,7 @@ public interface TestConstants {
276276

277277
//monitoring constants
278278
public static final String MONITORING_EXPORTER_WEBAPP_VERSION =
279-
getNonEmptySystemProperty("wko.it.monitoring.exporter.webapp.version", "2.1.0");
279+
getNonEmptySystemProperty("wko.it.monitoring.exporter.webapp.version", "2.1.1");
280280
public static final String MONITORING_EXPORTER_BRANCH =
281281
getNonEmptySystemProperty("wko.it.monitoring.exporter.branch", "main");
282282
public static final String PROMETHEUS_CHART_VERSION =

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,13 @@ public class MonitoringUtils {
126126
public static void downloadMonitoringExporterApp(String configFile, String applicationDir) {
127127
//version of wls-exporter.war published in https://github.com/oracle/weblogic-monitoring-exporter/releases/
128128
String monitoringExporterRelease = MONITORING_EXPORTER_WEBAPP_VERSION;
129-
String monitoringExporterWebAppScriptVersion = monitoringExporterRelease.substring(0,
130-
monitoringExporterRelease.length() - 2);
131129
String curlDownloadCmd = String.format("cd %s && "
132-
+ "curl -O -L -k https://github.com/oracle/weblogic-monitoring-exporter/releases/download/v%s/get%s.sh",
130+
+ "curl -O -L -k https://github.com/oracle/weblogic-monitoring-exporter/releases/download/v%s/get_v%s.sh",
133131
applicationDir,
134132
monitoringExporterRelease,
135-
monitoringExporterWebAppScriptVersion);
133+
monitoringExporterRelease);
136134
String monitoringExporterBuildFile = String.format(
137-
"%s/get%s.sh", applicationDir, monitoringExporterWebAppScriptVersion);
135+
"%s/get_v%s.sh", applicationDir, monitoringExporterRelease);
138136
logger.info("execute command a monitoring exporter curl command {0} ", curlDownloadCmd);
139137
assertTrue(Command
140138
.withParams(new CommandParams()

0 commit comments

Comments
 (0)