Merge "Remove deprecated release jobs"

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 3d75dde..8327a83 100644 (file)
--- 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 dfda527..6206deb 100644 (file)
--- 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 0947e87..409402b 100644 (file)
--- 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 7ea108c..12f452e 100644 (file)
--- 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 5b4449e..1a003e4 100644 (file)
--- 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: '-f champ-service/pom.xml 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 efd7409..8fb7826 100644 (file)
--- 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 a7ed2af..9577215 100644 (file)
--- 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 796be43..d648b6c 100644 (file)
--- 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 8145631..bf1a3e1 100644 (file)
--- 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 e4e5200..fabeade 100644 (file)
--- 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 35aad1d..6cefc63 100644 (file)
--- 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 d2ee0bf..cee9852 100644 (file)
--- 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 6a9453e..4d70dea 100644 (file)
--- 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 10e8806..e4a99a1 100644 (file)
--- 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-resources.yaml b/jjb/aai/aai-resources.yaml
index 5470e30..011031e 100644 (file)
--- 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 1526dd3..7dd3d5c 100644 (file)
--- 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 a76033d..ee84012 100644 (file)
--- 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 20aea93..78732a5 100644 (file)
--- 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 a293e92..f9dac15 100644 (file)
--- 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 16f5a76..08b1900 100644 (file)
--- 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 01bfcca..312b36d 100644 (file)
--- 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 7f989a5..d5a03ba 100644 (file)
--- 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 be4708d..9276f45 100644 (file)
--- 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 04c104b..54df8dd 100644 (file)
--- 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/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index b14d819..3a75844 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -13,6 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+          sign-artifacts: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -20,7 +21,6 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
 
-    sign-artifacts: true
     project: 'ccsdk/apps'
     stream:
       - 'master':

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index d190371..fc2047a 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -7,6 +7,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+          sign-artifacts: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -14,7 +15,6 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
 
-    sign-artifacts: true
     project: 'ccsdk/cds'
     stream:
       - 'master':

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 89b4c4f..da56629 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -7,13 +7,13 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+          sign-artifacts: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
-    sign-artifacts: true
     project: 'ccsdk/distribution'
     stream:
       - 'master':

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index b77ec28..4dcc3d4 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -7,8 +7,8 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+          sign-artifacts: true
 
-    sign-artifacts: true
     project: 'ccsdk/features'
     stream:
       - 'master':

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 39dbc14..8a79ebf 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -7,8 +7,8 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+          sign-artifacts: true
 
-    sign-artifacts: true
     project: 'ccsdk/parent'
     stream:
       - 'master':

diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index a708af0..d8e75f0 100644 (file)
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -7,8 +7,8 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+          sign-artifacts: true
 
-    sign-artifacts: true
     project: 'ccsdk/platform/plugins'
     stream:
       - 'master':

diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 3c880cd..3161d18 100644 (file)
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -7,8 +7,8 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+          sign-artifacts: true
 
-    sign-artifacts: true
     project: 'ccsdk/sli/adaptors'
     stream:
       - 'master':

diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 9bfba2f..39904c3 100644 (file)
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -7,8 +7,8 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+          sign-artifacts: true
 
-    sign-artifacts: true
     project: 'ccsdk/sli/core'
     stream:
       - 'master':

diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 24ed996..ca5deee 100644 (file)
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -7,8 +7,8 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+          sign-artifacts: true
 
-    sign-artifacts: true
     project: 'ccsdk/sli/plugins'
     stream:
       - 'master':

diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index 40df523..996a236 100644 (file)
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -7,8 +7,8 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+          sign-artifacts: true
 
-    sign-artifacts: true
     project: 'ccsdk/utils'
     stream:
       - 'master':

diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 6d0d2dc..778324c 100644 (file)
--- 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-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
index a0abcbc..2e2c9e3 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/analytics/tca'
     mvn-settings: 'dcaegen2-analytics-tca-settings'
@@ -19,7 +17,6 @@
     build-node: ubuntu1604-builder-4c-4g
 
     jobs:
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-verify-java':
           mvn-params: '-DskipTests=true'
       - '{project-name}-{stream}-merge-java'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
index 6740dae..6be71b3 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'ManagementInterface-suite':
           trigger_jobs:
@@ -17,4 +15,4 @@
           trigger_jobs:
            - '{project-name}-{stream}-docker-java-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 7f06524..104dfbf 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,8 +6,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/collectors/datafile'
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
@@ -17,7 +15,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-docker-8c-8g
+          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-hv-ves-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
index 7108503..749d01e 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'testsuites':
           trigger_jobs:

diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 7cc2dbd..f8dd9e0 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -6,8 +6,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/collectors/hv-ves'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
@@ -21,18 +19,12 @@
           mvn-goals: 'clean install'
       - '{project-name}-{stream}-merge-java':
           mvn-goals: 'clean deploy'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean deploy -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
-          # No-op
-          script: '/bin/true'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 1be5726..a1237ce 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -5,14 +5,15 @@
     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-docker-8c-8g
+          maven-versions-plugin: true
 
     project: 'dcaegen2/collectors/restconf'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-restconf-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 79dab04..0ef35e6 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index d7bc964..5911e3e 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -5,14 +5,15 @@
     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-docker-8c-8g
+          maven-versions-plugin: true
 
     project: 'dcaegen2/collectors/ves'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-ves-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index 5dee646..f1943d4 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-deployments-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index 285d4e0..6d35e18 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-blueprints-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
index 5a75199..5e4e33e 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
@@ -6,8 +6,6 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
-            version-properties: 'blueprint-generator/version.properties'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g

diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 8f753b4..4b161fb 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-configbinding-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index b6bb261..8f2c351 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 586ba64..a5acd4d 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -5,19 +5,12 @@
     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':
-          mvn-goals: 'clean package docker:build -DpushImage'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImage'
@@ -26,8 +19,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 3d7e40e..1d94f6c 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -52,26 +52,3 @@
       - gerrit-info-yaml-verify
     project: dcaegen2/platform/plugins
     branch: master
-
-#job added to retain dublin plugin build under ubuntu
-- project:
-    name: dcaegen2-platform-plugins-dublin
-    project-name: 'dcaegen2-platform-plugins'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'dcaegen2/platform/plugins'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'dcaegen2-platform-plugins-settings'
-    # due to a strange macro / variable translation problem this needs
-    # to be passed as a string block to properly get the properties
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index cb19425..a93fd57 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-policy-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index a810fea..5c76222 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -5,18 +5,12 @@
     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':
-          mvn-goals: 'clean package docker:build -DpushImage'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImage'

diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
index 94e7e2e..392879e 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'bbs-testsuites':
           trigger_jobs:

diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index 2e49ee5..3dfb537 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -6,8 +6,6 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
-            version-properties: 'components/bbs-event-processor/version.properties'
     subproject:
       - 'bbs-event-processor':
           pom: 'components/bbs-event-processor/pom.xml'
@@ -15,8 +13,36 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+    mvn-settings: 'dcaegen2-services-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'
+
+- project:
+    name: dcaegen2-services-bbs-event-processor-release
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-bbs-event-processor'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          version-properties-file: 'components/bbs-event-processor/version.properties'
+          mvn-pom: 'components/bbs-event-processor/pom.xml'
+          mvn-params: '-f components/bbs-event-processor/pom.xml'
+          pattern: 'components/bbs-event-processor/**'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          mvn-goals: 'clean package docker:build -DpushImage -f components/bbs-event-processor/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          pattern: 'components/bbs-event-processor/**'
+
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true

diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 1c5ad80..9fce045 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -6,8 +6,6 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
-            version-properties: 'components/datalake-handler/version.properties'
     subproject:
       - 'datalake-handler':
           pom: 'components/datalake-handler/pom.xml'
@@ -22,6 +20,36 @@
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
 
+- project:
+    name: dcaegen2-services-datalake-handler-release
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-datalake-handler'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'components/datalake-handler/pom.xml'
+          mvn-params: '-f components/datalake-handler/pom.xml'
+          version-properties-file: 'components/datalake-handler/version.properties'
+          pattern: 'components/datalake-handler/**'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          mvn-goals: 'clean package docker:build -DpushImage -f components/datalake-handler/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          pattern: 'components/datalake-handler/**'
+
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dcaegen2-services-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'
+
 - project:
     name: dcaegen2-services-datalake-handler-sonar
     jobs:

diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index 3527ffd..ff7f9ae 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-heartbeat-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-services-java.yaml b/jjb/dcaegen2/dcaegen2-services-java.yaml
deleted file mode 100644 (file)
index 525a9fa..0000000
--- a/jjb/dcaegen2/dcaegen2-services-java.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- project:
-    name: dcaegen2-services-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-docker-8c-8g
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-settings'

diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index e319e68..8e6db35 100644 (file)
--- 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-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 8de9d2b..8015e00 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -7,9 +7,6 @@
       - 'master':
           branch: 'master'
           mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version'
-      - 'dublin':
-          branch: 'dublin'
-          mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-version'
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
@@ -19,20 +16,16 @@
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-verify-java':
         mvn-goals: 'clean install'
       - '{project-name}-{stream}-merge-java':
         mvn-goals: 'clean deploy'
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          script: '/bin/true'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version'

diff --git a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
index 1d4bcf2..fc34f99 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
@@ -7,9 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-
     functionality:
       - 'pmmapper':
           trigger_jobs:

diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 8e3047f..1d4afc4 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -5,14 +5,15 @@
     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-docker-8c-8g
+          maven-versions-plugin: true
 
     project: 'dcaegen2/services/prh'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-prh-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index a342447..f191fbc 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -5,7 +5,6 @@
     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-docker-8c-8g
@@ -15,8 +14,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-sdk-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index b4d2b5c..3c80e05 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -5,14 +5,15 @@
     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-docker-8c-8g
+          maven-versions-plugin: true
 
     project: 'dcaegen2/services/son-handler'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-son-handler-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index d91b378..4e579b6 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -13,8 +13,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-utils-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
index 4c610e1..1c3d660 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'testsuites'
     trigger_jobs:

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
index 2dd843f..9f71877 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
@@ -9,18 +9,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
     project: logging-analytics/pomba/pomba-aai-context-builder
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
 
     mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
     files: '**'

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
index 2fbfff6..ee01951 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
@@ -9,13 +9,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
     project: logging-analytics/pomba/pomba-audit-common
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: logging-analytics-pomba-pomba-audit-common-settings
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
index 091b9a4..a992704 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
@@ -9,19 +9,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'docker:build'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
     project: logging-analytics/pomba/pomba-context-aggregator
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
index f41625f..709c374 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
@@ -9,18 +9,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
     project: logging-analytics/pomba/pomba-network-discovery-context-builder
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
index cd1d05c..c4bc170 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
@@ -9,18 +9,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
     project: logging-analytics/pomba/pomba-sdnc-context-builder
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 95de71c..50f042d 100644 (file)
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -15,18 +15,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: 'ubuntu1604-docker-8c-8g'
     project: 'logging-analytics'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'logging-analytics-settings'
     files: '**'
     archive-artifacts: ''
@@ -82,7 +74,6 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g

diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 495b3cc..ec98862 100644 (file)
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -15,13 +15,13 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-apigateway-docker-image.sh'
+      - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-pom: 'distributions/msb-apigateway/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker'
     project: 'msb/apigateway'
     stream:
       - 'master':

diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml
index 3b4df5f..bdb16ab 100644 (file)
--- a/jjb/msb/msb-csit.yaml
+++ b/jjb/msb/msb-csit.yaml
@@ -8,12 +8,12 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
+          trigger_jobs:
       - 'rest-service':
-          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
+          trigger_jobs:
       - 'tcp-service':
-          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
+          trigger_jobs:
       - 'iag-redirect-discovery':
-          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
+          trigger_jobs:
     robot-options: ''
     branch: 'master'

diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 054016d..3c91a97 100644 (file)
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -9,13 +9,13 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-discovery-docker-image.sh'
+      - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-pom: 'distributions/msb-apigateway/pom.xml'
+          mvn-params: '-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker'
     project: 'msb/discovery'
     stream:
       - 'master':

diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index 5df6d07..4367193 100644 (file)
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -9,7 +9,6 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
     project: 'msb/java-sdk'
     stream:
       - 'master':

diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 8cfdbd4..8e5a1ce 100644 (file)
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -9,7 +9,6 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
     project: 'msb/swagger-sdk'
     stream:
       - 'master':

diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh
deleted file mode 100755 (executable)
index bdb5a84..0000000
--- a/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-#
-echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
-
-CURRENTDIR="$(pwd)"
-echo $CURRENTDIR
-
-echo '========================== Building docker for vesagent =========================='
-chmod 755 ./vesagent/docker/*.*
-./vesagent/docker/docker-build.sh

diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index b90b929..7ac4fca 100644 (file)
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -20,13 +20,13 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
+      - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
+          maven-goals: install
+          mvn-params: '-P docker'
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-2g

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index c2b72cf..7a17cdb 100644 (file)
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -19,17 +19,17 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          maven-goals: install
+          mvn-params: '-P docker'
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 40c79e6..6bbbd94 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -12,21 +12,21 @@
           pom: 'vio/pom.xml'
           pattern: 'vio/**'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
+      - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
+          maven-goals: install
+          mvn-params: '-P docker'
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
deleted file mode 100644 (file)
index 0066522..0000000
--- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- project:
-    name: multicloud-openstack-vmware-vesagent-java
-    project-name: 'multicloud-openstack-vmware-vesagent'
-    project: 'multicloud/openstack/vmware'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
-    subproject:
-      - 'vesagent':
-          pom: 'vesagent/pom.xml'
-          pattern: 'vesagent/**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-#- project:
-#    name: multicloud-openstack-vmware-vesagent-arm64-java
-#    project-name: 'multicloud-openstack-vmware-vesagent-arm64'
-#    project: 'multicloud/openstack/vmware'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'multicloud-openstack-vmware-settings'
-#    subproject:
-#      - 'vesagent':
-#          pom: 'vesagent/pom.xml'
-#          pattern: 'vesagent/**'
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-version-shell-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-goals: 'install'
-#          script:
-#            !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
-#    files: '**'
-#    archive-artifacts: ''

diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml
deleted file mode 100644 (file)
index ca22904..0000000
--- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
-    name: multicloud-openstack-vmware-vesagent-python
-    project-name: 'multicloud-openstack-vmware-vesagent'
-    project: 'multicloud/openstack/vmware'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
-    subproject:
-      - 'vesagent':
-          path: 'vesagent'
-          pattern: 'vesagent/**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 9947419..9d6e58a 100644 (file)
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -66,13 +66,13 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
+      - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
+          maven-goals: install
+          mvn-params: '-P docker'
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-memcached-4c-4g'

diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index 7e462d2..eb40189 100644 (file)
--- 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 1388620..c276629 100644 (file)
--- 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-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml
index 52547b2..a754408 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-ci.yaml
+++ b/jjb/sdc/sdc-dcae-d-ci.yaml
@@ -10,13 +10,17 @@
     project-name: 'sdc-dcae-d-ci'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-docker-version-java-daily':
-         build-node: 'ubuntu1604-docker-8c-8g'
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: '-DskipTests=true'
+      - 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
+          maven-versions-plugin: true
+          mvn-params: '-P docker -DskipTests=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     project: 'sdc/dcae-d/ci'
     stream:
       - 'master':

diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
index 08044a1..39f1c09 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
@@ -4,8 +4,11 @@
     project-name: 'sdc-dcae-d-dt-be-property'
     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/dcae-d/dt-be-property'
     stream:
       - 'master':

diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
index ee6eec0..a334d75 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt.yaml
@@ -5,13 +5,18 @@
     build-node: ubuntu1604-builder-4c-2g
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          build-node: 'ubuntu1604-docker-8c-8g'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'server,docker'
-          mvn-params: '-DskipTests=true'
+      - 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
+          maven-versions-plugin: true
+          mvn-params: '-P server,docker -DskipTests=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+
     project: 'sdc/dcae-d/dt'
     stream:
       - 'master':

diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
index 4f459d5..8e4149d 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-fe.yaml
+++ b/jjb/sdc/sdc-dcae-d-fe.yaml
@@ -5,13 +5,18 @@
     build-node: ubuntu1604-builder-4c-2g
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          build-node: 'ubuntu1604-docker-8c-8g'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-DskipTests=true'
+      - 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
+          maven-versions-plugin: true
+          mvn-params: '-P docker -DskipTests=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+
     project: 'sdc/dcae-d/fe'
     stream:
       - 'master':

diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
index 397b829..71c7dbe 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
+++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
@@ -14,8 +14,12 @@
     build-node: ubuntu1604-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P default -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 

diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index bda26b7..6289621 100644 (file)
--- 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 69c6e4a..557962f 100644 (file)
--- 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 f1ef58c..55633ee 100644 (file)
--- 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-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index b204229..3a258e5 100644 (file)
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -11,10 +11,17 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
+      - 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
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+
     project: 'sdc/sdc-workflow-designer'
     stream:
       - 'master':

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index a6e2dd5..431135f 100644 (file)
--- 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':

diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index 1f7092e..30a1de5 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -9,7 +9,6 @@
         sign-artifacts: true
         build-node: centos7-builder-4c-4g
         maven-versions-plugin: true
-    - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'vnfsdk/functest'
     stream:

diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 07e9dc8..b15f4d8 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -16,17 +16,11 @@
           mvn-pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
-          mvn-goals: 'docker:build'
-          docker-image-name: 'onap/vnfsdk/refrepo'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+#      - '{project-name}-{stream}-docker-version-java-daily':
+#          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#          build-node: ubuntu1604-docker-8c-8g
     project: 'vnfsdk/refrepo'
     stream:
       - 'master':

diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index efd7555..1709243 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -9,7 +9,6 @@
         sign-artifacts: true
         build-node: centos7-builder-4c-4g
         maven-versions-plugin: true
-    - '{project-name}-{stream}-release-version-java-daily'
     project: 'vnfsdk/validation'
     stream:
       - 'master':

diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index 0044317..6611f5e 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -11,7 +11,6 @@
           mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-java-daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g