From: Carsten Lund <lund@research.att.com>
Date: Tue, 21 Feb 2017 01:12:39 +0000 (+0000)
Subject: Changed build script since manager zip downloaded
X-Git-Tag: 1.0.0-Amsterdam~649
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=627335f0e0fe1f6be86b9d3ee5c9c5d8e661b497;p=ci-management.git

Changed build script since manager zip downloaded

Change-Id: I170720b3f52fb80ed079c9faf8d38b835c52bb12
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 a08d13903..9d99194fc 100755
--- a/jjb/dcae/script-collectors-ves-daily-release.sh
+++ b/jjb/dcae/script-collectors-ves-daily-release.sh
@@ -11,17 +11,7 @@
 
 
 # downloading DCAE Controller service manager for VES collector
-GROUP_ID='org.openecomp.dcae.controller'
-ARTIFACT_ID='dcae-controller-service-standardeventcollector-manager'
-VERSION='0.1.0-SNAPSHOT'
-FORMAT='zip'
-SCOPE='runtime'
-ARTIFACT_FQID="${GROUP_ID}:${ARTIFACT_ID}:${VERSION}:${FORMAT}:${SCOPE}"
-ARTIFACT_FILENAME="${ARTIFACT_ID}-${VERSION}-${SCOPE}.${FORMAT}"
-${MVN} -s "$SETTINGS_FILE" \
-   org.apache.maven.plugins:maven-dependency-plugin:2.10:copy \
-   -Dartifact="${ARTIFACT_FQID}" -DoutputDirectory=/tmp
-DCM_AR="/tmp/${ARTIFACT_FILENAME}"
+DCM_AR="${WORKSPACE}/manager.zip"
 if [ ! -f "${DCM_AR}" ]
 then
     echo "FATAL error cannot locate ${DCM_AR}"
@@ -115,4 +105,4 @@ if [ ! -z "$REPO" ]; then
 
     # push to remote repo
     docker push "${RFQI}"
-fi
\ No newline at end of file
+fi
diff --git a/jjb/dcae/script-collectors-ves-merge.sh b/jjb/dcae/script-collectors-ves-merge.sh
index a08d13903..ba468473a 100755
--- a/jjb/dcae/script-collectors-ves-merge.sh
+++ b/jjb/dcae/script-collectors-ves-merge.sh
@@ -10,18 +10,8 @@
 # before calling this script
 
 
-# downloading DCAE Controller service manager for VES collector
-GROUP_ID='org.openecomp.dcae.controller'
-ARTIFACT_ID='dcae-controller-service-standardeventcollector-manager'
-VERSION='0.1.0-SNAPSHOT'
-FORMAT='zip'
-SCOPE='runtime'
-ARTIFACT_FQID="${GROUP_ID}:${ARTIFACT_ID}:${VERSION}:${FORMAT}:${SCOPE}"
-ARTIFACT_FILENAME="${ARTIFACT_ID}-${VERSION}-${SCOPE}.${FORMAT}"
-${MVN} -s "$SETTINGS_FILE" \
-   org.apache.maven.plugins:maven-dependency-plugin:2.10:copy \
-   -Dartifact="${ARTIFACT_FQID}" -DoutputDirectory=/tmp
-DCM_AR="/tmp/${ARTIFACT_FILENAME}"
+# DCAE Controller service manager for VES collector
+DCM_AR="${WORKSPACE}/manager.zip"
 if [ ! -f "${DCM_AR}" ]
 then
     echo "FATAL error cannot locate ${DCM_AR}"
@@ -115,4 +105,4 @@ if [ ! -z "$REPO" ]; then
 
     # push to remote repo
     docker push "${RFQI}"
-fi
\ No newline at end of file
+fi
diff --git a/jjb/dcae/script-collectors-ves-verify.sh b/jjb/dcae/script-collectors-ves-verify.sh
index f502cc951..08939084a 100755
--- a/jjb/dcae/script-collectors-ves-verify.sh
+++ b/jjb/dcae/script-collectors-ves-verify.sh
@@ -16,18 +16,8 @@
 
 
 
-# downloading DCAE Controller service manager for VES collector
-GROUP_ID='org.openecomp.dcae.controller'
-ARTIFACT_ID='dcae-controller-service-standardeventcollector-manager'
-VERSION='0.1.0-SNAPSHOT'
-FORMAT='zip'
-SCOPE='runtime'
-ARTIFACT_FQID="${GROUP_ID}:${ARTIFACT_ID}:${VERSION}:${FORMAT}:${SCOPE}"
-ARTIFACT_FILENAME="${ARTIFACT_ID}-${VERSION}-${SCOPE}.${FORMAT}"
-${MVN} -s "$SETTINGS_FILE" \
-   org.apache.maven.plugins:maven-dependency-plugin:2.10:copy \
-   -Dartifact="${ARTIFACT_FQID}" -DoutputDirectory=/tmp
-DCM_AR="/tmp/${ARTIFACT_FILENAME}"
+# DCAE Controller service manager for VES collector
+DCM_AR="${WORKSPACE}/manager.zip"
 if [ ! -f "${DCM_AR}" ]
 then
     echo "FATAL error cannot locate ${DCM_AR}"
@@ -111,4 +101,4 @@ docker build --rm -t "${LFQI}" "${BUILD_PATH}"
 #
 # io registry  DOCKER_REPOSITORIES="nexus3.openecomp.org:10001 \
 # release registry                   nexus3.openecomp.org:10002 \
-# snapshot registry                   nexus3.openecomp.org:10003"
\ No newline at end of file
+# snapshot registry                   nexus3.openecomp.org:10003"