Merge "Remove upload for verify"

6 files changed, 28 insertions, 35 deletions

diff --git a/jjb/dcae/script-apod-analytics-daily-release.sh b/jjb/dcae/script-apod-analytics-daily-release.sh
index 9b17374e9..7a15c2f07 100755
--- a/jjb/dcae/script-apod-analytics-daily-release.sh
+++ b/jjb/dcae/script-apod-analytics-daily-release.sh
@@ -8,7 +8,7 @@ echo '================= STARTING SCRIPT TO CREATE DEBIAN FILE ================='
 # Extract the username and password for the nexus repo
 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 ${STAGE_DIR}/stage/opt/app/cdap-apps
 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 @@ cp ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${OUTPUT_DIR}/${OUTPUT_FILE}
 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}
diff --git a/jjb/dcae/script-apod-analytics-merge.sh b/jjb/dcae/script-apod-analytics-merge.sh
index fedf54fa1..da379784d 100755
--- a/jjb/dcae/script-apod-analytics-merge.sh
+++ b/jjb/dcae/script-apod-analytics-merge.sh
@@ -8,7 +8,7 @@ echo '================ STARTING SCRIPT TO CREATE DEBIAN FILE =================='
 # 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 ${STAGE_DIR}/stage/opt/app/cdap-apps
 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 @@ cp ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${OUTPUT_DIR}/${OUTPUT_FILE}
 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}
diff --git a/jjb/dcae/script-apod-analytics-verify.sh b/jjb/dcae/script-apod-analytics-verify.sh
index e12dfa493..6ce3edfba 100755
--- a/jjb/dcae/script-apod-analytics-verify.sh
+++ b/jjb/dcae/script-apod-analytics-verify.sh
@@ -8,7 +8,7 @@ echo '================ STARTING SCRIPT TO CREATE DEBIAN FILE =================='
 # Extract the username and password and URL for the nexus repo"
 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 ${STAGE_DIR}/stage/opt/app/cdap-apps
 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'
@@ -72,19 +75,11 @@ ${WORKSPACE}/dcae-apod-buildtools/scripts/package -b debian -d ${STAGE_DIR} \
 # date stamp and build number on it.
 # For example:  dcae-analytics-tca_17.01.0-YYYYMMDDHHMMSS-XXX.deb
 # Both files will then be uploaded to the repository.
+# Verify script does not upload to Nexus repo.
 
 cp ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${OUTPUT_DIR}/${OUTPUT_FILE}
 
 echo 'Contents of output directory'
 ls -lR ${OUTPUT_DIR}
 
-SEND_TO="${OPENECOMP_NEXUS_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}"
-
-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}
-
 echo '================ ENDING SCRIPT TO CREATE DEBIAN FILE ===================='
diff --git a/jjb/dcae/script-apod-cdap-daily-release.sh b/jjb/dcae/script-apod-cdap-daily-release.sh
index 045baa190..05e803255 100755
--- a/jjb/dcae/script-apod-cdap-daily-release.sh
+++ b/jjb/dcae/script-apod-cdap-daily-release.sh
@@ -6,7 +6,7 @@ echo '================= STARTING SCRIPT TO CREATE DEBIAN FILE ================='
 # Extract the username and password to the nexus repo from the 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)
@@ -75,11 +75,11 @@ cp ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${OUTPUT_DIR}/${OUTPUT_FILE}
 echo "Contents of output directory"
 ls -lR ${OUTPUT_DIR}
 
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE}"
+SEND_TO="${REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE}"
 echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus: ${SEND_TO}"
 curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE} ${SEND_TO}
 
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
 
 echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus: ${SEND_TO}"
 curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${SEND_TO}
diff --git a/jjb/dcae/script-apod-cdap-merge.sh b/jjb/dcae/script-apod-cdap-merge.sh
index 045baa190..05e803255 100755
--- a/jjb/dcae/script-apod-cdap-merge.sh
+++ b/jjb/dcae/script-apod-cdap-merge.sh
@@ -6,7 +6,7 @@ echo '================= STARTING SCRIPT TO CREATE DEBIAN FILE ================='
 # Extract the username and password to the nexus repo from the 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)
@@ -75,11 +75,11 @@ cp ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${OUTPUT_DIR}/${OUTPUT_FILE}
 echo "Contents of output directory"
 ls -lR ${OUTPUT_DIR}
 
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE}"
+SEND_TO="${REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE}"
 echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus: ${SEND_TO}"
 curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE} ${SEND_TO}
 
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
 
 echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus: ${SEND_TO}"
 curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${SEND_TO}
diff --git a/jjb/dcae/script-apod-cdap-verify.sh b/jjb/dcae/script-apod-cdap-verify.sh
index 045baa190..d3aa1ed8c 100755
--- a/jjb/dcae/script-apod-cdap-verify.sh
+++ b/jjb/dcae/script-apod-cdap-verify.sh
@@ -6,7 +6,7 @@ echo '================= STARTING SCRIPT TO CREATE DEBIAN FILE ================='
 # Extract the username and password to the nexus repo from the 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)
@@ -69,19 +69,11 @@ ${WORKSPACE}/dcae-apod-buildtools/scripts/package -b debian -d ${STAGE_DIR} \
 # date stamp and build number on it.
 # For example:  dcae-cda-small-hadoop_17.01.0-YYYYMMDDHHMMSS-XXX.deb
 # Both files will then be uploaded to the repository.
+# Verify script does not upload to Nexus
 
 cp ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${OUTPUT_DIR}/${OUTPUT_FILE}
 
 echo "Contents of output directory"
 ls -lR ${OUTPUT_DIR}
 
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE}"
-echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus: ${SEND_TO}"
-curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE} ${SEND_TO}
-
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
-
-echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus: ${SEND_TO}"
-curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${SEND_TO}
-
 echo '================= ENDING SCRIPT TO CREATE DEBIAN FILE ==================='