diff options
Diffstat (limited to 'jjb/dcae')
| -rw-r--r-- | jjb/dcae/dcae-controller-analytics.yaml | 10 | ||||
| -rw-r--r-- | jjb/dcae/dcae-demo.yaml | 34 | ||||
| -rw-r--r-- | jjb/dcae/pgaas.yaml | 35 | ||||
| -rwxr-xr-x[-rw-r--r--] | jjb/dcae/script-pgaas-daily-release.sh (renamed from jjb/dcae/include-raw-pgaas.sh) | 15 | ||||
| -rwxr-xr-x | jjb/dcae/script-pgaas-merge.sh | 33 | ||||
| -rwxr-xr-x | jjb/dcae/script-pgaas-verify.sh | 33 |
6 files changed, 131 insertions, 29 deletions
diff --git a/jjb/dcae/dcae-controller-analytics.yaml b/jjb/dcae/dcae-controller-analytics.yaml index be54386d6..8b20f01f8 100644 --- a/jjb/dcae/dcae-controller-analytics.yaml +++ b/jjb/dcae/dcae-controller-analytics.yaml @@ -2,10 +2,14 @@ - project: name: dcae-controller-analytics project-name: 'dcae-controller-analytics' + subproject: + - 'utils': + pom: 'dcae-analytics-cdap-common-model/pom.xml' + pattern: 'dcae-analytics-cdap-common-model/**' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-java-daily' project: 'dcae/controller/analytics' stream: diff --git a/jjb/dcae/dcae-demo.yaml b/jjb/dcae/dcae-demo.yaml new file mode 100644 index 000000000..066ca324d --- /dev/null +++ b/jjb/dcae/dcae-demo.yaml @@ -0,0 +1,34 @@ +--- + +- project: + name: dcae-demo + project-name: 'dcae-demo' + stream: 'master' + project: 'dcae/demo' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcae-demo-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-8c-8g + mvn-goals: '--version' + mvn-goals-versioning: '--version' + jobs: + - '{project-name}-{stream}-daily-release-scm-mvn-script': + mvn-goals: 'clean deploy' + maven-deploy-properties: | + deployAtEnd=true + script: | + bash dcae-demo-controller/src/main/docker-build/build.sh + bash dcae-demo-controller/src/main/docker-build/push.sh nexus3.openecomp.org:10003 + - '{project-name}-{stream}-merge-scm-mvn-script': + mvn-goals: 'clean deploy' + script: | + bash dcae-demo-controller/src/main/docker-build/build.sh + bash dcae-demo-controller/src/main/docker-build/push.sh nexus3.openecomp.org:10003 + - '{project-name}-{stream}-verify-scm-mvn-script': + mvn-goals: 'clean install' + script: | + bash dcae-demo-controller/src/main/docker-build/build.sh + diff --git a/jjb/dcae/pgaas.yaml b/jjb/dcae/pgaas.yaml index fa18bcec1..33893cb9f 100644 --- a/jjb/dcae/pgaas.yaml +++ b/jjb/dcae/pgaas.yaml @@ -3,19 +3,6 @@ - project: name: dcae-pgaas project-name: 'dcae-pgaas' - jobs: - - '{project-name}-{stream}-two-scm-verify-script' - - - # script: build script to execute - # extra-project: extra gerrit project to checkout - # extra-refspec: refspec for the extra project - # extra-branch: branch to checkout for the extra project - # checkout-dir: directory to checkout the extra project to - # DO NOT SET THIS TO anything that translates to - # $WORKSPACE as it will destroy the initial - # project checkout - project: 'dcae/pgaas' stream: - 'master': @@ -23,10 +10,22 @@ mvn-settings: 'dcae-pgaas-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g - extra-project: 'dcae/utils/buildtools' - extra-branch: 'master' + build-node: ubuntu1604-docker-8c-8g + mvn-goals: '--version' + mvn-goals-versioning: '--version' + extra-project: 'dcae/buildtools' extra-refspec: 'refs/heads/{branch}' + extra-branch: 'master' checkout-dir: 'buildtools' - script: - !include-raw-escape: 'include-raw-pgaas.sh' + jobs: + - '{project-name}-{stream}-daily-release-2scm-mvn-script': + maven-deploy-properties: | + deployAtEnd=true + script: + !include-raw-escape: 'script-pgaas-daily-release.sh' + - '{project-name}-{stream}-merge-2scm-mvn-script': + script: + !include-raw-escape: 'script-pgaas-merge.sh' + - '{project-name}-{stream}-verify-2scm-mvn-script': + script: + !include-raw-escape: 'script-pgaas-verify.sh' diff --git a/jjb/dcae/include-raw-pgaas.sh b/jjb/dcae/script-pgaas-daily-release.sh index cd84b03b4..0a4e3434a 100644..100755 --- a/jjb/dcae/include-raw-pgaas.sh +++ b/jjb/dcae/script-pgaas-daily-release.sh @@ -18,14 +18,13 @@ echo "machine nexus.openecomp.org login ${USER} password ${PASS}" > "${NETRC}" echo $NEXUS_RAW -export REPACKAGEDEBIANUPLOAD="set -x; curl -k \ - --netrc-file '${NETRC}' \ - --upload-file '{0}' \ - '${NEXUS_RAW}/org.openecomp.dcae.pgaas/deb-snapshots/{2}/{1}'" -export REPACKAGEDEBIANUPLOAD2="set -x; curl -k \ - --netrc-file '${NETRC}' \ - --upload-file '{0}' \ - '${NEXUS_RAW}/org.openecomp.dcae.pgaas/deb-snapshots/{2}/{4}-LATEST.deb'" + +REPO="${NEXUS_RAW}/org.openecomp.dcae.pgaas/deb-snapshots" + +export REPACKAGEDEBIANUPLOAD="set -x; curl -k --netrc-file '${NETRC}' \ + --upload-file '{0}' '${REPO}/{2}/{1}'" +export REPACKAGEDEBIANUPLOAD2="set -x; curl -k --netrc-file '${NETRC}' \ + --upload-file '{0}' '${REPO}/{2}/{4}-LATEST.deb'" make debian echo "================= ENDING SCRIPT TO CREATE DEBIAN FILES =================" diff --git a/jjb/dcae/script-pgaas-merge.sh b/jjb/dcae/script-pgaas-merge.sh new file mode 100755 index 000000000..0a4e3434a --- /dev/null +++ b/jjb/dcae/script-pgaas-merge.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# Create a debian package and push to remote repo +# +echo "============== STARTING SCRIPT TO CREATE DEBIAN FILES =================" + +export BUILD_NUMBER="${BUILD_ID}" +export PATH=$PATH:${WORKSPACE}/buildtools/bin + +export NEXUS_RAW="${NEXUSPROXY}/content/sites/raw" +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") + +# Create a netrc file for use with curl +export NETRC=$(mktemp) +echo "machine nexus.openecomp.org login ${USER} password ${PASS}" > "${NETRC}" + +echo $NEXUS_RAW + + +REPO="${NEXUS_RAW}/org.openecomp.dcae.pgaas/deb-snapshots" + +export REPACKAGEDEBIANUPLOAD="set -x; curl -k --netrc-file '${NETRC}' \ + --upload-file '{0}' '${REPO}/{2}/{1}'" +export REPACKAGEDEBIANUPLOAD2="set -x; curl -k --netrc-file '${NETRC}' \ + --upload-file '{0}' '${REPO}/{2}/{4}-LATEST.deb'" +make debian +echo "================= ENDING SCRIPT TO CREATE DEBIAN FILES =================" + +#echo "============= STARTING SCRIPT TO CREATE JAVADOCS FILES ================" +#make upload-javadocs +#echo "============= ENDING SCRIPT TO CREATE JAVADOCS FILES ==================" diff --git a/jjb/dcae/script-pgaas-verify.sh b/jjb/dcae/script-pgaas-verify.sh new file mode 100755 index 000000000..51c802f60 --- /dev/null +++ b/jjb/dcae/script-pgaas-verify.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# Create a debian package and push to remote repo +# +echo "============== STARTING SCRIPT TO CREATE DEBIAN FILES =================" + +export BUILD_NUMBER="${BUILD_ID}" +export PATH=$PATH:${WORKSPACE}/buildtools/bin + +export NEXUS_RAW="${NEXUSPROXY}/content/sites/raw" +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") + +# Create a netrc file for use with curl +export NETRC=$(mktemp) +echo "machine nexus.openecomp.org login ${USER} password ${PASS}" > "${NETRC}" + +echo $NEXUS_RAW + + +REPO="${NEXUS_RAW}/org.openecomp.dcae.devnull/" + +export REPACKAGEDEBIANUPLOAD="set -x; curl -k --netrc-file '${NETRC}' \ + --upload-file '{0}' '${REPO}/{2}/{1}'" +export REPACKAGEDEBIANUPLOAD2="set -x; curl -k --netrc-file '${NETRC}' \ + --upload-file '{0}' '${REPO}/{2}/{4}-LATEST.deb'" +make debian +echo "================= ENDING SCRIPT TO CREATE DEBIAN FILES =================" + +#echo "============= STARTING SCRIPT TO CREATE JAVADOCS FILES ================" +#make upload-javadocs +#echo "============= ENDING SCRIPT TO CREATE JAVADOCS FILES ==================" |