diff options
-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 | ||||
-rw-r--r-- | jjb/testsuite/testsuite.yaml | 14 |
4 files changed, 19 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} diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml new file mode 100644 index 000000000..399a53558 --- /dev/null +++ b/jjb/testsuite/testsuite.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: testsuite + project-name: 'testsuite' + jobs: + - '{project-name}-{stream}-docker-shell-daily' + + project: 'testsuite' + + stream: + - 'master': + branch: 'master' + + mvn-settings: 'testsuite-settings' |