diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-02-22 01:30:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@openecomp.org> | 2017-02-22 01:30:50 +0000 |
| commit | 0e02120e4197de97f1b9538e8fe026e1144173a7 (patch) | |
| tree | e422e07bdc78e199ce5cda4d12a739dcd60aeffb | |
| parent | 98f9b87b832a85a866edc798bad64f2f74add5ed (diff) | |
| parent | 3ab40a8399b4b3e347787fd0fd1912480f5320d1 (diff) | |
Merge "Put release debs in deb-releases"
| -rw-r--r-- | jjb/dcae/apod-analytics.yaml | 2 | ||||
| -rwxr-xr-x | jjb/dcae/script-apod-analytics-daily-release.sh | 5 | ||||
| -rwxr-xr-x | jjb/dcae/script-apod-cdap-daily-release.sh | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/jjb/dcae/apod-analytics.yaml b/jjb/dcae/apod-analytics.yaml index 96e9780cc..6ef85ab57 100644 --- a/jjb/dcae/apod-analytics.yaml +++ b/jjb/dcae/apod-analytics.yaml @@ -34,6 +34,6 @@ script: !include-raw-escape: 'script-apod-analytics-verify.sh' - '{project-name}-{stream}-merge-2scm-mvn-script': - mvn-goals: 'clean install' + mvn-goals: 'clean deploy' script: !include-raw-escape: 'script-apod-analytics-merge.sh' diff --git a/jjb/dcae/script-apod-analytics-daily-release.sh b/jjb/dcae/script-apod-analytics-daily-release.sh index 95a26c979..636f57a8b 100755 --- a/jjb/dcae/script-apod-analytics-daily-release.sh +++ b/jjb/dcae/script-apod-analytics-daily-release.sh @@ -81,12 +81,11 @@ cp ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${OUTPUT_DIR}/${OUTPUT_FILE} echo 'Contents of output directory' ls -lR ${OUTPUT_DIR} -SEND_TO="${REPO}/org.openecomp.dcae.apod.analytics/deb-snapshots/${OUTPUT_FILE}" +SEND_TO="${REPO}/org.openecomp.dcae.apod.analytics/deb-releases/${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="${REPO}/org.openecomp.dcae.apod.analytics/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}" - +SEND_TO="${REPO}/org.openecomp.dcae.apod.analytics/deb-releases/${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-cdap-daily-release.sh b/jjb/dcae/script-apod-cdap-daily-release.sh index 05e803255..49305bdc2 100755 --- a/jjb/dcae/script-apod-cdap-daily-release.sh +++ b/jjb/dcae/script-apod-cdap-daily-release.sh @@ -75,12 +75,11 @@ cp ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${OUTPUT_DIR}/${OUTPUT_FILE} echo "Contents of output directory" ls -lR ${OUTPUT_DIR} -SEND_TO="${REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE}" +SEND_TO="${REPO}/org.openecomp.dcae.apod.cdap/deb-releases/${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="${REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}" - +SEND_TO="${REPO}/org.openecomp.dcae.apod.cdap/deb-releases/${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} |