Merge "DMAAP-Refactor CLM project block"

diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
index 798ee14..03bc2d9 100644 (file)
--- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
+++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
@@ -14,8 +14,6 @@
           pattern: 'javatoscachecker/**'
           pom: 'javatoscachecker/pom.xml'
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f javatoscachecker/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
@@ -42,3 +40,14 @@
     mvn-settings: 'modeling-toscaparsers-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: modeling-toscaparsers-javatoscachecker-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-f javatoscachecker/pom.xml'
+    project: modeling/toscaparsers
+    project-name: 'modeling-toscaparsers-javatoscachecker'
+    build-node: ubuntu1604-docker-8c-8g
+    branch: 'master'
+    mvn-settings: 'modeling-toscaparsers-settings'

diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
index 25a72c7..e10e24d 100644 (file)
--- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
+++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
@@ -15,8 +15,6 @@
           pom: 'nfvparser/pom.xml'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
-      - gerrit-maven-clm:
-          mvn-params: '-f nfvparser/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
@@ -34,3 +32,13 @@
     mvn-settings: 'modeling-toscaparsers-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: modeling-toscaparsers-nfvparser-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-f nfvparser/pom.xml'
+    project: modeling/toscaparsers
+    project-name: 'modeling-toscaparsers-nfvparser'
+    branch: 'master'
+    mvn-settings: 'modeling-toscaparsers-settings'

diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index f9e94f9..b4590be 100644 (file)
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -12,7 +12,6 @@
           pom: 'azure/pom.xml'
           pattern: 'azure/**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
@@ -39,3 +38,12 @@
     mvn-settings: 'multicloud-azure-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: multicloud-azure-java-clm
+    jobs:
+      - gerrit-maven-clm
+    project: multicloud/azure
+    project-name: 'multicloud-azure'
+    branch: 'master'
+    mvn-settings: 'multicloud-azure-settings'

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 8f20092..8da6ac9 100644 (file)
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -12,7 +12,6 @@
           pom: 'multivimbroker/pom.xml'
           pattern: 'multivimbroker/**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
@@ -39,3 +38,12 @@
     mvn-settings: 'multicloud-framework-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: multicloud-framework-java-clm
+    jobs:
+      - gerrit-maven-clm
+    project: multicloud/framework
+    project-name: 'multicloud-framework'
+    branch: 'master'
+    mvn-settings: 'multicloud-framework-settings'

diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 00f6d02..0743a24 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -12,7 +12,6 @@
           pom: 'vio/pom.xml'
           pattern: 'vio/**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
@@ -39,3 +38,12 @@
     mvn-settings: 'multicloud-openstack-vmware-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: multicloud-openstack-vmware-java-clm
+    jobs:
+      - gerrit-maven-clm
+    project: multicloud/openstack/vmware
+    project-name: 'multicloud-openstack-vmware'
+    branch: 'master'
+    mvn-settings: 'multicloud-openstack-vmware-settings'

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index d6cc74d..0ff1cc5 100644 (file)
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -37,7 +37,6 @@
           pattern: 'windriver/**'
           pom: 'windriver/pom.xml'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
@@ -106,3 +105,13 @@
     mvn-settings: 'multicloud-openstack-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: multicloud-openstack-clm
+    jobs:
+      - gerrit-maven-clm
+    project: multicloud/openstack
+    project-name: 'multicloud-openstack'
+    build-node: ubuntu1604-memcached-4c-4g
+    branch: 'master'
+    mvn-settings: 'multicloud-openstack-settings'

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 7b490cb..788f0e7 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -3,7 +3,6 @@
     name: policy-apex-pdp
     project-name: 'policy-apex-pdp'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-scm-mvn-script':
           mvn-goals: 'clean deploy -B
@@ -39,3 +38,12 @@
     mvn-settings: 'policy-apex-pdp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-apex-pdp-clm
+    jobs:
+      - gerrit-maven-clm
+    project: policy/apex-pdp
+    project-name: 'policy-apex-pdp'
+    branch: 'master'
+    mvn-settings: 'policy-apex-pdp-settings'

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 29977b9..e8b5658 100644 (file)
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -3,7 +3,6 @@
     name: policy-api
     project-name: 'policy-api'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
 
@@ -28,3 +27,12 @@
     mvn-settings: 'policy-api-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-api-clm
+    jobs:
+      - gerrit-maven-clm
+    project: policy/api
+    project-name: 'policy-api'
+    branch: 'master'
+    mvn-settings: 'policy-api-settings'

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 8607d28..6613576 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -3,7 +3,6 @@
     name: policy-common
     project-name: 'policy-common'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
@@ -30,3 +29,12 @@
     mvn-settings: 'policy-common-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-common-clm
+    jobs:
+      - gerrit-maven-clm
+    project: policy/common
+    project-name: 'policy-common'
+    branch: 'master'
+    mvn-settings: 'policy-common-settings'

diff --git a/jjb/policy/policy-core.yaml b/jjb/policy/policy-core.yaml
index 1506f6c..4f457eb 100644 (file)
--- a/jjb/policy/policy-core.yaml
+++ b/jjb/policy/policy-core.yaml
@@ -3,7 +3,6 @@
     name: policy-core
     project-name: 'policy-core'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
 
@@ -28,3 +27,12 @@
     mvn-settings: 'policy-core-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-core-clm
+    jobs:
+      - gerrit-maven-clm
+    project: policy/core
+    project-name: 'policy-core'
+    branch: 'master'
+    mvn-settings: 'policy-core-settings'

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index bc5bcc6..53fc510 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -3,7 +3,6 @@
     name: policy-distribution
     project-name: 'policy-distribution'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
@@ -37,3 +36,12 @@
     mvn-settings: 'policy-distribution-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-distribution-clm
+    jobs:
+      - gerrit-maven-clm
+    project: policy/distribution
+    project-name: 'policy-distribution'
+    branch: 'master'
+    mvn-settings: 'policy-distribution-settings'

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 04f5ef3..31f9ba9 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -3,7 +3,6 @@
     name: policy-drools-applications
     project-name: 'policy-drools-applications'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
@@ -30,3 +29,12 @@
     mvn-settings: 'policy-drools-applications-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-drools-applications-clm
+    jobs:
+      - gerrit-maven-clm
+    project: policy/drools-applications
+    project-name: 'policy-drools-applications'
+    branch: 'master'
+    mvn-settings: 'policy-drools-applications-settings'

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index cb125b0..717eedc 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -3,8 +3,6 @@
     name: policy-drools-pdp
     project-name: 'policy-drools-pdp'
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-DskipTests'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-scm-mvn-script':
           mvn-goals: 'clean deploy -B
@@ -40,3 +38,13 @@
     mvn-settings: 'policy-drools-pdp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-drools-pdp-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-DskipTests'
+    project: policy/drools-pdp
+    project-name: 'policy-drools-pdp'
+    branch: 'master'
+    mvn-settings: 'policy-drools-pdp-settings'

diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index f116f7b..0dc51b1 100644 (file)
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -3,8 +3,6 @@
     name: policy-engine
     project-name: 'policy-engine'
     jobs:
-      - gerrit-maven-clm:
-          build-timeout: 30
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-scm-mvn-script':
           mvn-goals: 'clean deploy -B
@@ -40,3 +38,13 @@
     mvn-settings: 'policy-engine-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-engine-clm
+    jobs:
+      - gerrit-maven-clm:
+         build-timeout: 30
+    project: policy/engine
+    project-name: 'policy-engine'
+    branch: 'master'
+    mvn-settings: 'policy-engine-settings'

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 43a35c5..40b9dc1 100644 (file)
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -3,7 +3,6 @@
     name: policy-gui
     project-name: 'policy-gui'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
 
@@ -28,3 +27,12 @@
     mvn-settings: 'policy-gui-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-gui-clm
+    jobs:
+      - gerrit-maven-clm
+    project: policy/gui
+    project-name: 'policy-gui'
+    branch: 'master'
+    mvn-settings: 'policy-gui-settings'

diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 60d4881..e8513be 100644 (file)
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -3,7 +3,6 @@
     name: policy-models
     project-name: 'policy-models'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
 
@@ -28,3 +27,12 @@
     mvn-settings: 'policy-models-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-models-clm
+    jobs:
+      - gerrit-maven-clm
+    project: policy/models
+    project-name: 'policy-models'
+    branch: 'master'
+    mvn-settings: 'policy-models-settings'

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index ad789b2..13f2701 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -3,7 +3,6 @@
     name: policy-pap
     project-name: 'policy-pap'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
 
@@ -28,3 +27,12 @@
     mvn-settings: 'policy-pap-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-pap-clm
+    jobs:
+      - gerrit-maven-clm
+    project: policy/pap
+    project-name: 'policy-pap'
+    branch: 'master'
+    mvn-settings: 'policy-pap-settings'

diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 13e97a6..34f3578 100644 (file)
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -3,7 +3,6 @@
     name: policy-parent
     project-name: 'policy-parent'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -16,3 +15,12 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: policy-parent-clm
+    jobs:
+      - gerrit-maven-clm
+    project: policy/parent
+    project-name: 'policy-parent'
+    branch: 'master'
+    mvn-settings: 'policy-parent-settings'

diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml
index f124bb4..2d299b4 100644 (file)
--- a/jjb/policy/policy-pdp.yaml
+++ b/jjb/policy/policy-pdp.yaml
@@ -3,7 +3,6 @@
     name: policy-pdp
     project-name: 'policy-pdp'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
 
@@ -28,3 +27,12 @@
     mvn-settings: 'policy-pdp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-pdp-clm
+    jobs:
+      - gerrit-maven-clm
+    project: policy/pdp
+    project-name: 'policy-pdp'
+    branch: 'master'
+    mvn-settings: 'policy-pdp-settings'

diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 8da603c..0b45026 100644 (file)
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -3,7 +3,6 @@
     name: policy-xacml-pdp
     project-name: 'policy-xacml-pdp'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
 
@@ -28,3 +27,12 @@
     mvn-settings: 'policy-xacml-pdp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-xacml-pdp-clm
+    jobs:
+      - gerrit-maven-clm
+    project: policy/xacml-pdp
+    project-name: 'policy-xacml-pdp'
+    branch: 'master'
+    mvn-settings: 'policy-xacml-pdp-settings'