Skip to content

Commit 4c46ecf

Browse files
committed
Revert " replaced build with download fir webapp monitoring exporter"
This reverts commit 70c257f.
1 parent 352c598 commit 4c46ecf

File tree

1 file changed

+6
-8
lines changed
  • samples/kubernetes/end2end/demo-domains/domainBuilder

1 file changed

+6
-8
lines changed

Diff for: samples/kubernetes/end2end/demo-domains/domainBuilder/build.sh

+6-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
set -e # Exit immediately if a command exits with a non-zero status.
66

77
WDT_VERSION=0.24
8-
MONITORING_EXPORTER_VERSION=1.1.0
98

109
CUR_DIR="$(dirname "$(readlink -f "$0")")" # get the absolute path of this file's folder
1110
PRJ_ROOT=${CUR_DIR}/../../../../..
@@ -19,14 +18,13 @@ function createArchive() {
1918
cd test-webapp && mvn clean install && cd ..
2019
cp test-webapp/target/testwebapp.war ${TMP_DIR}/archive/wlsdeploy/applications/testwebapp.war
2120

22-
echo "Download the metrics exporter webapp from ://github.com/oracle/weblogic-monitoring-exporter/releases/download/v${MONITORING_EXPORTER_VERSION}/get${MONITORING_EXPORTER_VERSION}.sh..."
23-
21+
echo 'Build the metrics exporter...'
2422
cd $PRJ_ROOT
25-
wget https://github.com/oracle/weblogic-monitoring-exporter/releases/download/v${MONITORING_EXPORTER_VERSION}/get${MONITORING_EXPORTER_VERSION}.sh
26-
bash get${MONITORING_EXPORTER_VERSION}.sh ${CUR_DIR}/../../dashboard/exporter-config.yaml
27-
23+
mvn clean install
24+
cd webapp
25+
mvn clean package -Dconfiguration=${CUR_DIR}/../../dashboard/exporter-config.yaml
2826
cd $CUR_DIR
29-
cp $PRJ_ROOT/wls-exporter.war \
27+
cp $PRJ_ROOT/webapp/target/wls-exporter.war \
3028
${TMP_DIR}/archive/wlsdeploy/applications/wls-exporter.war
3129

3230
echo 'Build the WDT archive...'
@@ -36,7 +34,7 @@ function createArchive() {
3634

3735
function cleanTmpDir() {
3836
rm -rf ${CUR_DIR}/test-webapp/target
39-
rm -rf ${PRJ_ROOT}/wls-exporter.war
37+
rm -rf ${PRJ_ROOT}/webapp/target
4038
rm -rf ${TMP_DIR}
4139
}
4240

0 commit comments

Comments
 (0)