Merge "dcaegen2 jobs updates for jjb migration"

diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml
index 0e9bac8..f8a0612 100644 (file)
--- a/jjb/aai/aai-oom.yaml
+++ b/jjb/aai/aai-oom.yaml
@@ -19,8 +19,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'dublin':
+          branch: 'dublin'
 
     mvn-settings: 'aai-oom-settings'
     files: '**'

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/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