summaryrefslogtreecommitdiffstats
path: root/jjb/dcae
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/dcae')
-rw-r--r--jjb/dcae/apod-analytics.yaml8
-rw-r--r--jjb/dcae/apod-cdap.yaml2
-rw-r--r--jjb/dcae/dmaapbc.yaml36
-rwxr-xr-xjjb/dcae/script-apod-analytics-daily-release.sh4
-rwxr-xr-xjjb/dcae/script-apod-analytics-merge.sh4
-rwxr-xr-xjjb/dcae/script-apod-analytics-verify.sh4
-rwxr-xr-xjjb/dcae/script-apod-cdap-daily-release.sh4
-rwxr-xr-xjjb/dcae/script-apod-cdap-merge.sh4
-rwxr-xr-xjjb/dcae/script-apod-cdap-verify.sh4
-rwxr-xr-xjjb/dcae/script-dmaapbc-daily-release.sh34
-rwxr-xr-xjjb/dcae/script-dmaapbc-merge.sh30
-rwxr-xr-xjjb/dcae/script-dmaapbc-verify.sh19
12 files changed, 136 insertions, 17 deletions
diff --git a/jjb/dcae/apod-analytics.yaml b/jjb/dcae/apod-analytics.yaml
index 8f7365c9a..887635f7d 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':
- mvn-goals: 'clean deploy'
+ - '{project-name}-{stream}-verify-2scm-mvn-script':
+ mvn-goals: 'clean install'
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/apod-cdap.yaml b/jjb/dcae/apod-cdap.yaml
index 2a2d65fa8..76563afcc 100644
--- a/jjb/dcae/apod-cdap.yaml
+++ b/jjb/dcae/apod-cdap.yaml
@@ -11,7 +11,7 @@
mvn-settings: 'dcae-apod-cdap-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1604-basebuild-4c-4g
mvn-goals: '--version'
mvn-goals-versioning: '--version'
extra-project: 'dcae/apod/buildtools'
diff --git a/jjb/dcae/dmaapbc.yaml b/jjb/dcae/dmaapbc.yaml
new file mode 100644
index 000000000..dee2e9568
--- /dev/null
+++ b/jjb/dcae/dmaapbc.yaml
@@ -0,0 +1,36 @@
+---
+
+- project:
+ name: dcae-dmaapbc
+ # job template iterators
+ project-name: 'dcae-dmaapbc'
+ stream:
+ - 'master':
+ branch: 'master'
+ # apply to all jobs
+ project: 'dcae/dmaapbc'
+ mvn-settings: 'dcae-dmaapbc-settings'
+ # default to no op
+ mvn-goals: '--version'
+ # default to no op
+ mvn-goals-versioning: '--version'
+ files: '**'
+ archive-artifacts: ''
+
+ jobs:
+ - '{project-name}-{stream}-daily-release-scm-mvn-script':
+ mvn-goals-versioning:
+ 'versions:set versions:update-child-modules versions:commit'
+ mvn-goals: 'clean deploy'
+ maven-deploy-properties: |
+ deployAtEnd=true
+ script:
+ !include-raw-escape: 'script-dmaapbc-daily-release.sh'
+ - '{project-name}-{stream}-merge-scm-mvn-script':
+ mvn-goals: 'clean deploy'
+ script:
+ !include-raw-escape: 'script-dmaapbc-merge.sh'
+ - '{project-name}-{stream}-verify-scm-mvn-script':
+ mvn-goals: 'clean install'
+ script:
+ !include-raw-escape: 'script-dmaapbc-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}
diff --git a/jjb/dcae/script-dmaapbc-daily-release.sh b/jjb/dcae/script-dmaapbc-daily-release.sh
new file mode 100755
index 000000000..710a3196d
--- /dev/null
+++ b/jjb/dcae/script-dmaapbc-daily-release.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+# Create a debian package and push to remote repo
+#
+#
+# build the docker image. tag and then push to the remote repo
+#
+
+# !!! make sure the yaml file include docker-login as a builder before calling
+# this script
+
+IMAGE="dcae_dmaapbc"
+TAG="1.0.0"
+LFQI="${IMAGE}:${TAG}"
+BUILD_PATH="${WORKSPACE}"
+
+# build a docker image
+docker build --rm -f ${WORKSPACE}/Dockerfile -t ${LFQI} ${BUILD_PATH}
+
+
+#
+# push the image
+#
+# io registry DOCKER_REPOSITORIES="nexus3.openecomp.org:10001 \
+# release registry nexus3.openecomp.org:10002 \
+# snapshot registry nexus3.openecomp.org:10003"
+REPO="nexus3.openecomp.org:10003"
+
+RFQI="${REPO}/${LFQI}"
+# tag
+docker tag ${LFQI} ${RFQI}
+
+# push to remote repo
+docker push ${RFQI}
+
diff --git a/jjb/dcae/script-dmaapbc-merge.sh b/jjb/dcae/script-dmaapbc-merge.sh
new file mode 100755
index 000000000..dd350917e
--- /dev/null
+++ b/jjb/dcae/script-dmaapbc-merge.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# Create a debian package and push to remote repo
+#
+#
+# build the docker image. tag and then push to the remote repo
+#
+
+# !!! make sure the yaml file include docker-login as a builder before calling
+# this script
+
+IMAGE='dcae_dmaapbc'
+TAG='1.0.0'
+LFQI="${IMAGE}:${TAG}"
+BUILD_PATH="${WORKSPACE}"
+
+# build a docker image
+docker build --rm -f "${WORKSPACE}"/Dockerfile -t "${LFQI}" "${BUILD_PATH}"
+
+
+#
+# push the image
+#
+# io registry DOCKER_REPOSITORIES="nexus3.openecomp.org:10001 \
+# release registry nexus3.openecomp.org:10002 \
+# snapshot registry nexus3.openecomp.org:10003"
+REPO='nexus3.openecomp.org:10003'
+RFQI="${REPO}/${LFQI}"
+docker tag ${LFQI} ${RFQI}
+docker push ${RFQI}
+
diff --git a/jjb/dcae/script-dmaapbc-verify.sh b/jjb/dcae/script-dmaapbc-verify.sh
new file mode 100755
index 000000000..8db2c9c74
--- /dev/null
+++ b/jjb/dcae/script-dmaapbc-verify.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Create a debian package and push to remote repo
+#
+#
+# build the docker image. tag and then push to the remote repo
+#
+
+# !!! make sure the yaml file include docker-login as a builder before calling
+# this script
+
+IMAGE="dcae_dmaapbc"
+TAG="1.0.0"
+LFQI="${IMAGE}:${TAG}"
+BUILD_PATH="${WORKSPACE}"
+
+# build a docker image
+docker build --rm -f ${WORKSPACE}/Dockerfile -t ${LFQI} ${BUILD_PATH}
+
+