diff options
38 files changed, 158 insertions, 118 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 3d75dde0d..8327a83d3 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -19,8 +19,8 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' files: '**' @@ -50,8 +50,8 @@ project: 'aai/aai-common' project-name: 'aai-aai-common' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index dfda527de..6206deb8b 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -23,8 +23,8 @@ project: 'aai/babel' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-babel-settings' @@ -53,8 +53,8 @@ project: 'aai/babel' project-name: 'aai-babel' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-babel-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml index 0947e871d..409402b68 100644 --- a/jjb/aai/aai-cacher.yaml +++ b/jjb/aai/aai-cacher.yaml @@ -19,8 +19,8 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-cacher-settings' mvn-version: 'mvn35' files: '**' @@ -49,8 +49,8 @@ project: 'aai/cacher' project-name: 'aai-cacher' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-cacher-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml index 7ea108c83..12f452ebe 100644 --- a/jjb/aai/aai-chameleon.yaml +++ b/jjb/aai/aai-chameleon.yaml @@ -23,8 +23,8 @@ project: 'aai/chameleon' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-chameleon-settings' @@ -40,8 +40,8 @@ project: 'aai/chameleon' project-name: 'aai-chameleon' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-chameleon-settings' - project: diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index f8ad73f9d..1a003e404 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - mvn-params: 'docker:build -Dmaven.test.skip=true' + mvn-params: '-Pdocker -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -24,8 +24,8 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-champ-settings' files: '**' archive-artifacts: '' @@ -52,8 +52,8 @@ project: 'aai/champ' project-name: 'aai-champ' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-champ-settings' - project: diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index efd7409ce..8fb7826ed 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -22,8 +22,8 @@ container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/data-router' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-data-router-settings' @@ -51,8 +51,8 @@ project: 'aai/data-router' project-name: 'aai-data-router' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-data-router-settings' - project: diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index a7ed2afb0..9577215e5 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -24,8 +24,8 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-esr-gui-settings' files: '**' archive-artifacts: '' @@ -41,8 +41,8 @@ project: 'aai/esr-gui' project-name: 'aai-esr-gui' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-esr-gui-settings' - project: diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 796be438f..d648b6c48 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -24,8 +24,8 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-esr-server-settings' files: '**' archive-artifacts: '' @@ -54,8 +54,8 @@ project: 'aai/esr-server' project-name: 'aai-esr-server' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-esr-server-settings' - project: diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index 8145631af..bf1a3e150 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -17,8 +17,8 @@ maven-versions-plugin: true project: 'aai/event-client' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-event-client-settings' @@ -46,8 +46,8 @@ project: 'aai/event-client' project-name: 'aai-event-client' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-event-client-settings' - project: diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml index e4e520050..fabeade98 100644 --- a/jjb/aai/aai-gallifrey.yaml +++ b/jjb/aai/aai-gallifrey.yaml @@ -16,8 +16,8 @@ container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/gallifrey' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-gallifrey-settings' @@ -32,8 +32,8 @@ project: 'aai/gallifrey' project-name: 'aai-gallifrey' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-gallifrey-settings' - project: diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml index 35aad1dbd..6cefc63bd 100644 --- a/jjb/aai/aai-gizmo.yaml +++ b/jjb/aai/aai-gizmo.yaml @@ -22,8 +22,8 @@ container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/gizmo' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-gizmo-settings' @@ -52,8 +52,8 @@ project: 'aai/gizmo' project-name: 'aai-gizmo' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-gizmo-settings' - project: diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index d2ee0bf07..cee985251 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -25,8 +25,8 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' files: '**' @@ -55,8 +55,8 @@ project: 'aai/graphadmin' project-name: 'aai-graphadmin' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 6a9453ebd..4d70dea73 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -17,8 +17,8 @@ maven-versions-plugin: true project: 'aai/logging-service' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-logging-service-settings' @@ -46,8 +46,8 @@ project: 'aai/logging-service' project-name: 'aai-logging-service' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-logging-service-settings' - project: diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 10e88067a..e4a99a1c1 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -22,8 +22,8 @@ container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/model-loader' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-model-loader-settings' @@ -52,8 +52,8 @@ project: 'aai/model-loader' project-name: 'aai-model-loader' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-model-loader-settings' - project: diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml index f8a061211..0e9bac8e0 100644 --- a/jjb/aai/aai-oom.yaml +++ b/jjb/aai/aai-oom.yaml @@ -19,8 +19,8 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-oom-settings' files: '**' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 5470e3053..011031e41 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -24,8 +24,8 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' files: '**' @@ -54,8 +54,8 @@ project: 'aai/resources' project-name: 'aai-resources' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 1526dd31c..7dd3d5c0d 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -17,8 +17,8 @@ maven-versions-plugin: true project: 'aai/rest-client' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-rest-client-settings' @@ -46,8 +46,8 @@ project: 'aai/rest-client' project-name: 'aai-rest-client' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-rest-client-settings' - project: diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index a76033d70..ee8401224 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -17,8 +17,8 @@ maven-versions-plugin: true project: 'aai/router-core' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-router-core-settings' @@ -46,8 +46,8 @@ project: 'aai/router-core' project-name: 'aai-router-core' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-router-core-settings' - project: diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 20aea9375..78732a577 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -53,8 +53,8 @@ project: 'aai/schema-service' project-name: 'aai-schema-service' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-schema-service-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index a293e920a..f9dac1548 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -23,8 +23,8 @@ project: 'aai/search-data-service' docker-image-name: 'onap/search-data-service' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-search-data-service-settings' @@ -70,8 +70,8 @@ project: 'aai/search-data-service' project-name: 'aai-search-data-service' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-search-data-service-settings' - project: diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 16f5a7687..08b1900bf 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -22,8 +22,8 @@ container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/sparky-be' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-sparky-be-settings' @@ -51,8 +51,8 @@ project: 'aai/sparky-be' project-name: 'aai-sparky-be' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-sparky-be-settings' - project: diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 01bfccaed..312b36d73 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -12,8 +12,8 @@ maven-versions-plugin: true project: 'aai/sparky-fe' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-sparky-fe-settings' diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml index 7f989a514..d5a03baa7 100644 --- a/jjb/aai/aai-spike.yaml +++ b/jjb/aai/aai-spike.yaml @@ -22,8 +22,8 @@ container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/spike' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-spike-settings' @@ -51,8 +51,8 @@ project: 'aai/spike' project-name: 'aai-spike' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-spike-settings' - project: diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index be4708d1f..9276f45b8 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -24,8 +24,8 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' files: '**' @@ -54,8 +54,8 @@ project: 'aai/traversal' project-name: 'aai-traversal' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml index 04c104b03..54df8ddf9 100644 --- a/jjb/aai/aai-validation.yaml +++ b/jjb/aai/aai-validation.yaml @@ -22,8 +22,8 @@ container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/validation' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' - 'master': branch: 'master' mvn-settings: 'aai-validation-settings' @@ -52,8 +52,8 @@ project: 'aai/validation' project-name: 'aai-validation' stream: - - 'dublin': - branch: 'dublin' + - 'elalto': + branch: 'elalto' mvn-settings: 'aai-validation-settings' diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 6d0d2dcb4..778324c51 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -18,11 +18,11 @@ - '{project-name}-{stream}-verify-java': - '{project-name}-{stream}-merge-java': mvn-goals: 'clean install' - - '{project-name}-{stream}-docker-java-shell-daily': + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g mvn-goals: 'clean deploy docker:build -DpushImage' - # No-op - script: '/bin/true' - build-node: 'ubuntu1604-docker-8c-8g' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' - project: name: dcaegen2-analytics-tca-gen2-sonar diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index 7f065240c..861d57124 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -17,7 +17,10 @@ archive-artifacts: '' build-node: ubuntu1604-docker-8c-8g jobs: - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-verify-java': mvn-goals: 'clean install' - '{project-name}-{stream}-merge-java': diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 1be57266b..08b3dfb5d 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -5,7 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'dcaegen2/collectors/restconf' stream: diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index d7bc96472..2c2f6464e 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -5,7 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'dcaegen2/collectors/ves' stream: diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index e319e68a6..8e6db3508 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -5,12 +5,16 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-shell-daily': + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g mvn-goals: 'clean package docker:build -DpushImage' - # No-op - script: '/bin/true' - build-node: 'ubuntu1604-docker-8c-8g' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'dcaegen2/services/mapper' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 8e3047f7e..7cb2d03e9 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -5,7 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'dcaegen2/services/prh' stream: diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index b4d2b5c5b..3318b48b0 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -5,7 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'dcaegen2/services/son-handler' stream: diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml index 7e462d283..eb40189a8 100644 --- a/jjb/oom/offline-installer.yaml +++ b/jjb/oom/offline-installer.yaml @@ -8,6 +8,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' jobs: - '{project-name}-{stream}-review': diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 13886207c..c276629e1 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -35,6 +35,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' - 'casablanca': branch: 'casablanca' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index bda26b76a..62896212f 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -10,8 +10,12 @@ project-name: 'sdc-jtosca' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + project: 'sdc/jtosca' stream: - 'master': diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 69c6e4a8c..557962fc3 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -10,8 +10,12 @@ project-name: 'sdc-sdc-distribution-client' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + project: 'sdc/sdc-distribution-client' stream: - 'master': diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index f1ef58c98..55633ee41 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -10,8 +10,12 @@ project-name: 'sdc-sdc-tosca' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + project: 'sdc/sdc-tosca' stream: - 'master': diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index a6e2dd58b..431135f0d 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -34,13 +34,18 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' - - '{project-name}-{stream}-release-version-java-daily': + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' - - '{project-name}-{stream}-docker-version-java-daily': - build-node: 'ubuntu1604-docker-8c-8g' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'sdc' stream: - 'master': |