commit 824b7cb8842a64fbacc22399e07d1ef0a4b92d06
author Lisa Revel <lr0306@att.com> Mon Feb 20 01:56:48 2017 +0000
committer Lisa Revel <lr0306@att.com> Mon Feb 20 15:21:47 2017 +0000
tree 6d8d78a2fc813e8bf79cc20b48264316b2a05a15
parent 596787c9792b1537904df3424a6eecbfe1035626

Remove upload for verify

Change-Id: I3267428c712580542f44c62a2050495c61691c65
Signed-off-by: Lisa Revel <lr0306@att.com>

jjb/dcae/script-apod-analytics-merge.sh

diff --git a/jjb/dcae/script-apod-analytics-merge.sh b/jjb/dcae/script-apod-analytics-merge.sh
index fedf54f..da37978 100755
--- a/jjb/dcae/script-apod-analytics-merge.sh
+++ b/jjb/dcae/script-apod-analytics-merge.sh
@@ -8,7 +8,7 @@
 # Extract the username, password for the nexus repo from the maven settings file
 USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
 PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
-OPENECOMP_NEXUS_REPO="${NEXUSPROXY}/content/sites/raw"
+REPO="${NEXUSPROXY}/content/sites/raw"
 
 #Create a netrc file for use with curl
 NETRC=$(mktemp)
@@ -51,7 +51,10 @@
 mkdir -p ${OUTPUT_DIR}
 
 echo 'Copying jar file to stage'
-cp ${WORKSPACE}/dcae-analytics-tca/target/dcae-analytics-tca-${POM_VERSION}.jar \
+JAR_FILE=$(ls ${WORKSPACE}/dcae-analytics-tca/target/ | \
+    grep dcae-analytics-tca- | grep -v javadoc | grep -v sources)
+
+cp ${WORKSPACE}/dcae-analytics-tca/target/${JAR_FILE} \
     ${STAGE_DIR}/stage/opt/app/cdap-apps
 
 echo 'Copying json file to stage'
@@ -78,11 +81,11 @@
 echo 'Contents of output directory'
 ls -lR ${OUTPUT_DIR}
 
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.analytics/deb-snapshots/${OUTPUT_FILE}"
+SEND_TO="${REPO}/org.openecomp.dcae.apod.analytics/deb-snapshots/${OUTPUT_FILE}"
 echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus Repo: ${SEND_TO}"
 curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE} ${SEND_TO}
 
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.analytics/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${REPO}/org.openecomp.dcae.apod.analytics/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
 
 echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus Repo: ${SEND_TO}"
 curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${SEND_TO}