Merge "Updated group id for deb files"

7 files changed, 15 insertions, 15 deletions

diff --git a/jjb/dcae/apod-analytics.yaml b/jjb/dcae/apod-analytics.yaml
index 8f7365c9a..a0cd58630 100644
--- a/jjb/dcae/apod-analytics.yaml
+++ b/jjb/dcae/apod-analytics.yaml
@@ -21,7 +21,7 @@
     checkout-dir: 'dcae-apod-buildtools'
 
     jobs:
-      - '{project-name}-{stream}-daily-release-scm-mvn-script':
+      - '{project-name}-{stream}-daily-release-2scm-mvn-script':
           mvn-goals-versioning:
             'versions:set versions:update-child-modules versions:commit'
           mvn-goals: 'clean deploy'
@@ -29,11 +29,11 @@
               deployAtEnd=true
           script:
             !include-raw-escape: 'script-apod-analytics-daily-release.sh'
-      - '{project-name}-{stream}-merge-scm-mvn-script':
+      - '{project-name}-{stream}-verify-2scm-mvn-script':
           mvn-goals: 'clean deploy'
           script:
             !include-raw-escape: 'script-apod-analytics-merge.sh'
-      - '{project-name}-{stream}-verify-scm-mvn-script':
+      - '{project-name}-{stream}-merge-2scm-mvn-script':
           mvn-goals: 'clean install'
           script:
               !include-raw-escape: 'script-apod-analytics-verify.sh'
diff --git a/jjb/dcae/script-apod-analytics-daily-release.sh b/jjb/dcae/script-apod-analytics-daily-release.sh
index f66980287..9b17374e9 100755
--- a/jjb/dcae/script-apod-analytics-daily-release.sh
+++ b/jjb/dcae/script-apod-analytics-daily-release.sh
@@ -78,11 +78,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/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+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/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+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}
diff --git a/jjb/dcae/script-apod-analytics-merge.sh b/jjb/dcae/script-apod-analytics-merge.sh
index bc1b2377e..fedf54fa1 100755
--- a/jjb/dcae/script-apod-analytics-merge.sh
+++ b/jjb/dcae/script-apod-analytics-merge.sh
@@ -78,11 +78,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/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+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/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+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}
diff --git a/jjb/dcae/script-apod-analytics-verify.sh b/jjb/dcae/script-apod-analytics-verify.sh
index 4d525d577..e12dfa493 100755
--- a/jjb/dcae/script-apod-analytics-verify.sh
+++ b/jjb/dcae/script-apod-analytics-verify.sh
@@ -78,11 +78,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/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+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/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+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}
diff --git a/jjb/dcae/script-apod-cdap-daily-release.sh b/jjb/dcae/script-apod-cdap-daily-release.sh
index 23d32eb4b..045baa190 100755
--- a/jjb/dcae/script-apod-cdap-daily-release.sh
+++ b/jjb/dcae/script-apod-cdap-daily-release.sh
@@ -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/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+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/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+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}
diff --git a/jjb/dcae/script-apod-cdap-merge.sh b/jjb/dcae/script-apod-cdap-merge.sh
index 23d32eb4b..045baa190 100755
--- a/jjb/dcae/script-apod-cdap-merge.sh
+++ b/jjb/dcae/script-apod-cdap-merge.sh
@@ -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/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+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/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+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}
diff --git a/jjb/dcae/script-apod-cdap-verify.sh b/jjb/dcae/script-apod-cdap-verify.sh
index 23d32eb4b..045baa190 100755
--- a/jjb/dcae/script-apod-cdap-verify.sh
+++ b/jjb/dcae/script-apod-cdap-verify.sh
@@ -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/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+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/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+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}