Merge "Move Coverity Scan toolset out of working directory"

diff --git a/global-jjb b/global-jjb
index 36bdbac..e336456 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 36bdbac77603d827912429a2db07941765640890
+Subproject commit e3364564e3f63cd337a5aafaadb483ba528ea4d2

diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 3c91a97..3e2fe17 100644 (file)
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -14,8 +14,8 @@
           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'
+          mvn-pom: 'distributions/msb-discovery/pom.xml'
+          mvn-params: '-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker'
     project: 'msb/discovery'
     stream:
       - 'master':

diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index 6289621..4088aeb 100644 (file)
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -15,6 +15,8 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'sdc/jtosca'
     stream:

diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 55633ee..78c8986 100644 (file)
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -15,6 +15,8 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'sdc/sdc-tosca'
     stream:

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 3f37206..7efff89 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -89,15 +89,29 @@
     mvn-opts: '-Xmx1024m'
 
 - project:
-    name: sdc-clm
+    name: sdc-clm-catalog
     jobs:
       - gerrit-maven-clm:
           build-timeout: 120
           submodule-timeout: 30
-          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+          mvn-params: '-P catalog -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
     nexus-iq-namespace: 'onap-'
     project: sdc
-    project-name: 'sdc'
+    project-name: 'sdc-catalog'
+    build-node: ubuntu1604-docker-8c-8g
+    branch: 'master'
+    mvn-settings: 'sdc-settings'
+
+- project:
+    name: sdc-clm-onboarding
+    jobs:
+      - gerrit-maven-clm:
+          build-timeout: 120
+          submodule-timeout: 30
+          mvn-params: '-P onboarding -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+    nexus-iq-namespace: 'onap-'
+    project: sdc
+    project-name: 'sdc-onboarding'
     build-node: ubuntu1604-docker-8c-8g
     branch: 'master'
     mvn-settings: 'sdc-settings'