From: Carsten Lund <lund@research.att.com>
Date: Mon, 20 Feb 2017 23:13:38 +0000 (+0000)
Subject: Changed mvn to ${MVN} to find the right exec.
X-Git-Tag: 1.0.0-Amsterdam~650^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dfe622cb6f4cde00c139cdcd7c02f9b83ab4ba3d;p=ci-management.git

Changed mvn to ${MVN} to find the right exec.

Change-Id: Iefa24d63cdf7f64e2365e2492dbc1408c2d1ca60
Signed-off-by: Carsten Lund <lund@research.att.com>
---

diff --git a/jjb/dcae/script-collectors-ves-daily-release.sh b/jjb/dcae/script-collectors-ves-daily-release.sh
index 53fb06e82..a08d13903 100755
--- a/jjb/dcae/script-collectors-ves-daily-release.sh
+++ b/jjb/dcae/script-collectors-ves-daily-release.sh
@@ -18,7 +18,7 @@ FORMAT='zip'
 SCOPE='runtime'
 ARTIFACT_FQID="${GROUP_ID}:${ARTIFACT_ID}:${VERSION}:${FORMAT}:${SCOPE}"
 ARTIFACT_FILENAME="${ARTIFACT_ID}-${VERSION}-${SCOPE}.${FORMAT}"
-mvn -s "$SETTINGS_FILE" \
+${MVN} -s "$SETTINGS_FILE" \
    org.apache.maven.plugins:maven-dependency-plugin:2.10:copy \
    -Dartifact="${ARTIFACT_FQID}" -DoutputDirectory=/tmp
 DCM_AR="/tmp/${ARTIFACT_FILENAME}"
diff --git a/jjb/dcae/script-collectors-ves-merge.sh b/jjb/dcae/script-collectors-ves-merge.sh
index 53fb06e82..a08d13903 100755
--- a/jjb/dcae/script-collectors-ves-merge.sh
+++ b/jjb/dcae/script-collectors-ves-merge.sh
@@ -18,7 +18,7 @@ FORMAT='zip'
 SCOPE='runtime'
 ARTIFACT_FQID="${GROUP_ID}:${ARTIFACT_ID}:${VERSION}:${FORMAT}:${SCOPE}"
 ARTIFACT_FILENAME="${ARTIFACT_ID}-${VERSION}-${SCOPE}.${FORMAT}"
-mvn -s "$SETTINGS_FILE" \
+${MVN} -s "$SETTINGS_FILE" \
    org.apache.maven.plugins:maven-dependency-plugin:2.10:copy \
    -Dartifact="${ARTIFACT_FQID}" -DoutputDirectory=/tmp
 DCM_AR="/tmp/${ARTIFACT_FILENAME}"
diff --git a/jjb/dcae/script-collectors-ves-verify.sh b/jjb/dcae/script-collectors-ves-verify.sh
index b39efbe8f..f502cc951 100755
--- a/jjb/dcae/script-collectors-ves-verify.sh
+++ b/jjb/dcae/script-collectors-ves-verify.sh
@@ -24,7 +24,7 @@ FORMAT='zip'
 SCOPE='runtime'
 ARTIFACT_FQID="${GROUP_ID}:${ARTIFACT_ID}:${VERSION}:${FORMAT}:${SCOPE}"
 ARTIFACT_FILENAME="${ARTIFACT_ID}-${VERSION}-${SCOPE}.${FORMAT}"
-mvn -s "$SETTINGS_FILE" \
+${MVN} -s "$SETTINGS_FILE" \
    org.apache.maven.plugins:maven-dependency-plugin:2.10:copy \
    -Dartifact="${ARTIFACT_FQID}" -DoutputDirectory=/tmp
 DCM_AR="/tmp/${ARTIFACT_FILENAME}"