Merge "Update memcached/redis packer templates"
authorBengt Thuree <bthuree@linuxfoundation.org>
Thu, 25 Oct 2018 22:58:10 +0000 (22:58 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 25 Oct 2018 22:58:10 +0000 (22:58 +0000)
176 files changed:
.gitmodules
global-jjb [new submodule]
jenkins-config/global-vars-production.sh
jenkins-config/global-vars-sandbox.sh
jjb/aaf/aaf-authz.yaml
jjb/aaf/aaf-cadi.yaml
jjb/aaf/aaf-luaplugin.yaml
jjb/aaf/aaf-sms.yaml
jjb/aai/aai-aai-common.yaml
jjb/aai/aai-cacher.yaml
jjb/aai/aai-graphadmin.yaml
jjb/aai/aai-resources.yaml
jjb/aai/aai-sparky-fe.yaml
jjb/aai/aai-traversal.yaml
jjb/appc/appc-cdt.yaml
jjb/appc/appc-deployment.yaml
jjb/appc/appc-master.yaml
jjb/ccsdk/apps.yaml
jjb/ccsdk/ccsdk-csit.yaml
jjb/ccsdk/distribution.yaml
jjb/ccsdk/features.yaml
jjb/ccsdk/parent.yaml
jjb/ccsdk/platform-plugins.yaml
jjb/ccsdk/sli-adaptors.yaml
jjb/ccsdk/sli-core.yaml
jjb/ccsdk/sli-northbound.yaml
jjb/ccsdk/sli-plugins.yaml
jjb/ccsdk/utils.yaml
jjb/ci-management/ci-management-packer-jobs.yaml
jjb/clamp/clamp.yaml
jjb/cli/cli.yaml
jjb/dcaegen2/apod-analytics.yaml
jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
jjb/dcaegen2/dcaegen2-collectors-ves.yaml
jjb/dcaegen2/dcaegen2-deployments.yaml
jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
jjb/dcaegen2/dcaegen2-platform-cli.yaml
jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
jjb/dcaegen2/dcaegen2-platform-plugins.yaml
jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
jjb/dcaegen2/dcaegen2-services-mapper.yaml
jjb/dcaegen2/dcaegen2-services-prh.yaml
jjb/dcaegen2/dcaegen2-utils.yaml
jjb/dcaegen2/dcaegen2.yaml
jjb/dmaap/dmaap-buscontroller.yaml
jjb/dmaap/dmaap-datarouter.yaml
jjb/dmaap/dmaap-dbcapi.yaml
jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
jjb/dmaap/dmaap-messagerouter-docker.yaml
jjb/dmaap/dmaap-messagerouter-messageservice.yaml
jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
jjb/externalapi/externalapi-nbi.yaml
jjb/global-jjb [deleted submodule]
jjb/global-jjb/jenkins-admin [new symlink]
jjb/global-jjb/jenkins-init-scripts [new symlink]
jjb/global-jjb/jjb [new symlink]
jjb/global-jjb/shell [new symlink]
jjb/global-macros.yaml
jjb/global-templates-c.yaml
jjb/global-templates-docker.yaml
jjb/global-templates-golang.yaml
jjb/global-templates-helm.yaml
jjb/global-templates-java.yaml
jjb/global-templates-python.yaml
jjb/global-templates-script.yaml
jjb/holmes/holmes-common.yaml
jjb/holmes/holmes-dsa.yaml
jjb/holmes/holmes-engine-mgt.yaml
jjb/holmes/holmes-rule-mgt.yaml
jjb/integration/integration.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml [new file with mode: 0644]
jjb/logging-analytics/logging-analytics.yaml
jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
jjb/modeling/modeling-toscaparsers-nfvparser.yaml
jjb/msb/msb-apigateway.yaml
jjb/msb/msb-discovery.yaml
jjb/msb/msb-java-sdk.yaml
jjb/msb/msb-swagger-sdk.yaml
jjb/multicloud/build-multicloud-azure-docker-image.sh [changed mode: 0644->0755]
jjb/multicloud/build-multicloud-framework-docker-image.sh [changed mode: 0644->0755]
jjb/multicloud/build-multicloud-k8s-docker-image.sh [new file with mode: 0755]
jjb/multicloud/build-multicloud-openstack-docker-image.sh [changed mode: 0644->0755]
jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh [changed mode: 0644->0755]
jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh [changed mode: 0644->0755]
jjb/multicloud/multicloud-azure-csit.yaml [moved from jjb/portal-sdk/portal-sdk-csit.yaml with 54% similarity]
jjb/multicloud/multicloud-azure-java.yaml
jjb/multicloud/multicloud-framework-java.yaml
jjb/multicloud/multicloud-k8s.yaml
jjb/multicloud/multicloud-openstack-vmware-java.yaml
jjb/multicloud/multicloud-openstack.yaml
jjb/music/music-jar.yaml
jjb/music/music-prom.yaml
jjb/music/music-trigger.yaml
jjb/music/music.yaml
jjb/oom/oom-registrator.yaml
jjb/oparent/oparent.yaml
jjb/optf/optf-cmso.yaml
jjb/optf/optf-has.yaml
jjb/optf/optf-osdf.yaml
jjb/policy/policy-apex-pdp.yaml
jjb/policy/policy-api.yaml
jjb/policy/policy-common.yaml
jjb/policy/policy-core.yaml
jjb/policy/policy-distribution.yaml
jjb/policy/policy-drools-applications.yaml
jjb/policy/policy-drools-pdp.yaml
jjb/policy/policy-engine.yaml
jjb/policy/policy-gui.yaml
jjb/policy/policy-models.yaml
jjb/policy/policy-pap.yaml
jjb/policy/policy-parent.yaml
jjb/policy/policy-pdp.yaml
jjb/policy/policy-xacml-pdp.yaml
jjb/portal-sdk/portal-sdk.yaml
jjb/portal/portal-csit.yaml [deleted file]
jjb/portal/portal.yaml
jjb/sdc/sdc-dcae-d-ci.yaml
jjb/sdc/sdc-dcae-d-dt-be-main.yaml
jjb/sdc/sdc-dcae-d-dt-be-property.yaml
jjb/sdc/sdc-dcae-d-dt.yaml
jjb/sdc/sdc-dcae-d-fe.yaml
jjb/sdc/sdc-jtosca.yaml
jjb/sdc/sdc-sdc-distribution-client.yaml
jjb/sdc/sdc-sdc-titan-cassandra.yaml
jjb/sdc/sdc-sdc-tosca.yaml
jjb/sdc/sdc-sdc-workflow-designer.yaml
jjb/sdc/sdc.yaml
jjb/sdnc/sdnc-apps.yaml
jjb/sdnc/sdnc-csit.yaml
jjb/sdnc/sdnc-northbound.yaml
jjb/sdnc/sdnc-oam.yaml
jjb/so/so-csit.yaml
jjb/so/so-libs.yaml
jjb/so/so.yaml
jjb/testsuite/testsuite-heatbridge-master.yaml
jjb/usecaseui/usecase-ui-server.yaml
jjb/usecaseui/usecase-ui.yaml
jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
jjb/vfc/vfc-gvnfm-vnfres-java.yaml
jjb/vfc/vfc-nfvo-catalog.yaml
jjb/vfc/vfc-nfvo-driver-ems-java.yaml
jjb/vfc/vfc-nfvo-driver-sfc.yaml
jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
jjb/vfc/vfc-nfvo-lcm-java.yaml
jjb/vfc/vfc-nfvo-multivimproxy.yaml
jjb/vfc/vfc-nfvo-resmanagement.yaml
jjb/vfc/vfc-nfvo-wfengine-java.yaml
jjb/vid/vid.yaml
jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
jjb/vnfsdk/vnfsdk-functest.yaml
jjb/vnfsdk/vnfsdk-ice-python.yaml
jjb/vnfsdk/vnfsdk-refrepo.yaml
jjb/vnfsdk/vnfsdk-validation.yaml
jjb/vnfsdk/vnfsdk-ves-agent.yaml
packer/common-packer

index 0fbb91a..4e7fbad 100644 (file)
@@ -1,5 +1,5 @@
-[submodule "jjb/global-jjb"]
-       path = jjb/global-jjb
+[submodule "global-jjb"]
+       path = global-jjb
        url = https://github.com/lfit/releng-global-jjb
 [submodule "packer/common-packer"]
        path = packer/common-packer
diff --git a/global-jjb b/global-jjb
new file mode 160000 (submodule)
index 0000000..e907c5a
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit e907c5af374f9d7bf3196543d853921697dbf17c
index cc5d85e..ea6767c 100644 (file)
@@ -1,9 +1,9 @@
 DOCKER_REGISTRY=nexus3.onap.org
 DOCKERHUB_REGISTRY=docker.io
 GERRIT_URL=https://gerrit.onap.org/r
-GIT_BASE=ssh://ecomp-jobbuilder@gerrit.onap.org:29418/$PROJECT
-GIT_NO_PROJECT=ssh://ecomp-jobbuilder@gerrit.onap.org:29418
-GIT_URL=ssh://ecomp-jobbuilder@gerrit.onap.org:29418
+GIT_BASE=git://cloud.onap.org/mirror/$PROJECT.git
+GIT_NO_PROJECT=git://cloud.onap.org/mirror
+GIT_URL=git://cloud.onap.org/mirror
 JENKINS_HOSTNAME=vex-yul-ecomp-jenkins-1
 JIRA_URL=https://jira.onap.org
 LOGS_REPO_URL=https://nexus.onap.org/service/local/repositories/logs
index 83ce04b..9fad0a1 100644 (file)
@@ -1,9 +1,9 @@
 DOCKER_REGISTRY=nexus3.onap.org
 DOCKERHUB_REGISTRY=docker.io
 GERRIT_URL=https://gerrit.onap.org/r
-GIT_BASE=ssh://ecomp-jobbuilder@gerrit.onap.org:29418/$PROJECT
-GIT_NO_PROJECT=ssh://ecomp-jobbuilder@gerrit.onap.org:29418
-GIT_URL=ssh://ecomp-jobbuilder@gerrit.onap.org:29418
+GIT_BASE=git://cloud.onap.org/mirror/$PROJECT.git
+GIT_NO_PROJECT=git://cloud.onap.org/mirror
+GIT_URL=git://cloud.onap.org/mirror
 JENKINS_HOSTNAME=vex-yul-ecomp-jenkins-2
 JIRA_URL=https://jira.onap.org
 LOGS_REPO_URL=https://nexus.onap.org/service/local/repositories/logs
index 047e668..a4568a1 100644 (file)
@@ -3,7 +3,6 @@
     name: aaf-authz
     project-name: 'aaf-authz'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'aaf-authz-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aaf-authz-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aaf/authz'
+    project-name: 'aaf-authz'
+    branch: 'master'
+    mvn-settings: 'aaf-authz-settings'
index 336001e..0ef86c0 100644 (file)
@@ -3,7 +3,6 @@
     name: aaf-cadi
     project-name: 'aaf-cadi'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'aaf-cadi-settings'
     files: '**'
     archive-artifacts: ''
+
+- project:
+    name: aaf-cadi-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aaf/cadi'
+    project-name: 'aaf-cadi'
+    branch: 'master'
+    mvn-settings: 'aaf-cadi-settings'
index a4c514a..9853e52 100644 (file)
@@ -1,13 +1,9 @@
 ---
 - project:
-    name: aaf-luaplugin
+    name: aaf-luaplugin-clm
     project-name: 'aaf-luaplugin'
     jobs:
       - gerrit-maven-clm
     project: 'aaf/luaplugin'
-    stream:
-      - 'master':
-          branch: 'master'
+    branch: 'master'
     mvn-settings: 'aaf-luaplugin-settings'
-    files: '**'
-    archive-artifacts: ''
index e0b7988..3e0e8cd 100644 (file)
@@ -4,6 +4,7 @@
     project-name: 'aaf-sms'
     subproject: 'aaf-sms-client'
     path: 'sms-service/src'
+    golangver: 'golang111'
     jobs:
       - '{project-name}-{stream}-verify-golang'
       - '{project-name}-{stream}-merge-golang'
index d083f62..37cdb1f 100644 (file)
@@ -10,6 +10,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -24,7 +26,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-aai-common-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -37,6 +39,6 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
index 91c7dac..1b2a9e6 100644 (file)
@@ -14,6 +14,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -28,7 +30,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/cacher'
     project-name: 'aai-cacher'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-cacher-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -40,7 +42,7 @@
       - gerrit-maven-clm
     project: 'aai/cacher'
     project-name: 'aai-cacher'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
 
index 6f85de0..2b29487 100644 (file)
@@ -14,6 +14,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -28,7 +30,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/graphadmin'
     project-name: 'aai-graphadmin'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -40,6 +42,6 @@
       - gerrit-maven-clm
     project: 'aai/graphadmin'
     project-name: 'aai-graphadmin'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
index af670d4..ef87c10 100644 (file)
@@ -14,6 +14,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -28,7 +30,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/resources'
     project-name: 'aai-resources'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-resources-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -40,6 +42,6 @@
       - gerrit-maven-clm
     project: 'aai/resources'
     project-name: 'aai-resources'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
index fa7719b..2595980 100644 (file)
     mvn-settings: 'aai-sparky-fe-settings'
     files: '**'
     archive-artifacts: ''
-
-- project:
-    name: aai-sparky-fe-clm
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/sparky-fe'
-    project-name: 'aai-sparky-fe'
-    branch: 'master'
-    mvn-settings: 'aai-sparky-fe-settings'
index 82385bf..058a285 100644 (file)
@@ -14,6 +14,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -28,7 +30,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/traversal'
     project-name: 'aai-traversal'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-traversal-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -40,6 +42,6 @@
       - gerrit-maven-clm
     project: 'aai/traversal'
     project-name: 'aai-traversal'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
index be7e1f7..c610857 100644 (file)
@@ -3,7 +3,6 @@
     name: appc-cdt
     project-name: 'appc-cdt'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: appc-cdt-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'appc/cdt'
+    project-name: 'appc-cdt'
+    branch: 'master'
+    mvn-settings: 'appc-cdt-settings'
+
index 040913b..fc4567a 100644 (file)
@@ -4,7 +4,6 @@
     name: appc-deployment
     project-name: 'appc-deployment'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -27,6 +26,8 @@
     jobs:
       - 'docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
+      - 'docker-version-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
     project: 'appc/deployment'
     stream:
       - 'master':
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: queue-docker-4c-4g
+
+- project:
+    name: appc-deployment-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'appc/deployment'
+    project-name: 'appc-deployment'
+    branch: 'master'
+    mvn-settings: 'appc-deployment-settings'
+
index ed973ec..1fdba4d 100644 (file)
@@ -3,10 +3,6 @@
     name: appc-master
     project-name: 'appc'
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-DskipTests'
-          build-timeout: 30
-          build-node: ubuntu1604-builder-8c-8g
       - '{project-name}-{stream}-verify-java':
           build-node: ubuntu1604-builder-8c-8g
       - '{project-name}-{stream}-merge-java':
     mvn-settings: 'appc-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx4096m'
+
+- project:
+    name: appc-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-DskipTests'
+          build-timeout: 30
+          build-node: ubuntu1604-builder-8c-8g
+    project: 'appc'
+    project-name: 'appc'
+    branch: 'master'
+    mvn-settings: 'appc-settings'
index 8d0cd11..2b183bc 100644 (file)
@@ -3,7 +3,6 @@
     name: ccsdk-apps
     project-name: 'ccsdk-apps'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -12,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-apps-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
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+- project:
+    name: ccsdk-apps-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'ccsdk/apps'
+    project-name: 'ccsdk-apps'
+    branch: 'master'
+    mvn-settings: 'ccsdk-apps-settings'
+    build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: ccsdk-apps-docker
     project-name: 'ccsdk-apps'
     jobs:
-      - 'docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
       - 'docker-version-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     project: 'ccsdk/apps'
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-apps-settings'
     files: '**'
     archive-artifacts: ''
index 44d2030..2890a4e 100644 (file)
@@ -5,7 +5,11 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'ccsdk'
-    stream: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
index c932630..ebedf9a 100644 (file)
@@ -3,7 +3,6 @@
     name: ccsdk-distribution
     project-name: 'ccsdk-distribution'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -11,6 +10,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
     name: ccsdk-distribution-docker
     project-name: 'ccsdk-distribution'
     jobs:
-      - 'docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
       - 'docker-version-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     project: 'ccsdk/distribution'
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: queue-docker-4c-4g
+
+- project:
+    name: ccsdk-distribution-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'ccsdk/distribution'
+    project-name: 'ccsdk-distribution'
+    branch: 'master'
+    mvn-settings: 'ccsdk-distribution-settings'
+    build-node: ubuntu1604-docker-8c-8g
+
index fc7020f..9c36c8e 100644 (file)
@@ -3,7 +3,6 @@
     name: ccsdk-features
     project-name: 'ccsdk-features'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -12,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-features-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
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: ccsdk-features-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'ccsdk/features'
+    project-name: 'ccsdk-features'
+    branch: 'master'
+    mvn-settings: 'ccsdk-features-settings'
+    build-node: ubuntu1604-builder-4c-4g
index 2efb907..3edf720 100644 (file)
@@ -3,7 +3,6 @@
     name: ccsdk-parent
     project-name: 'ccsdk-parent'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -12,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-parent-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
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+
+- project:
+    name: ccsdk-parent-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'ccsdk/parent'
+    project-name: 'ccsdk-parent'
+    branch: 'master'
+    mvn-settings: 'ccsdk-parent-settings'
+    build-node: ubuntu1604-builder-4c-4g
+
index 817b5b6..aeb79a6 100644 (file)
@@ -3,7 +3,6 @@
     name: ccsdk-platform-plugins
     project-name: 'ccsdk-platform-plugins'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -12,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-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
     mvn-settings: 'ccsdk-platform-plugins-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: ccsdk-platform-plugins-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'ccsdk/platform/plugins'
+    project-name: 'ccsdk-platform-plugins'
+    branch: 'master'
+    mvn-settings: 'ccsdk-platform-plugins-settings'
+    build-node: centos7-redis-4c-4g
+
index 06785a5..d2a85f3 100644 (file)
@@ -3,7 +3,6 @@
     name: ccsdk-sli-adaptors
     project-name: 'ccsdk-sli-adaptors'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -12,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-sli-adaptors-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
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: ccsdk-sli-adaptors-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'ccsdk/sli/adaptors'
+    project-name: 'ccsdk-sli-adaptors'
+    branch: 'master'
+    mvn-settings: 'ccsdk-sli-adaptors-settings'
+    build-node: ubuntu1604-builder-4c-4g
+
index c23a10e..c2192c0 100644 (file)
@@ -3,7 +3,6 @@
     name: ccsdk-sli-core
     project-name: 'ccsdk-sli-core'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -12,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-sli-core-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
@@ -21,6 +22,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: ccsdk-sli-core-sonar
     jobs:
     mvn-settings: 'ccsdk-sli-core-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: ccsdk-sli-core-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'ccsdk/sli/core'
+    project-name: 'ccsdk-sli-core'
+    branch: 'master'
+    mvn-settings: 'ccsdk-sli-core-settings'
+    build-node: ubuntu1604-builder-4c-4g
+
index 9b71c92..ff932d4 100644 (file)
@@ -3,7 +3,6 @@
     name: ccsdk-sli-northbound
     project-name: 'ccsdk-sli-northbound'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -12,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-sli-northbound-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
     mvn-settings: 'ccsdk-sli-northbound-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: ccsdk-sli-northbound-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'ccsdk/sli/northbound'
+    project-name: 'ccsdk-sli-northbound'
+    branch: 'master'
+    mvn-settings: 'ccsdk-sli-northbound-settings'
+    build-node: ubuntu1604-builder-4c-4g
+
index 4c011a0..e0e8104 100644 (file)
@@ -3,7 +3,6 @@
     name: ccsdk-sli-plugins
     project-name: 'ccsdk-sli-plugins'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -12,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-sli-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
@@ -20,6 +21,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+
 - project:
     name: ccsdk-sli-plugins-sonar
     jobs:
     mvn-settings: 'ccsdk-sli-plugins-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: ccsdk-sli-plugins-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'ccsdk/sli/plugins'
+    project-name: 'ccsdk-sli-plugins'
+    branch: 'master'
+    mvn-settings: 'ccsdk-sli-plugins-settings'
+
index 192899a..1ad5b1a 100644 (file)
@@ -3,7 +3,6 @@
     name: ccsdk-utils
     project-name: 'ccsdk-utils'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -12,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-utils-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
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+
+- project:
+    name: ccsdk-utils-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'ccsdk/utils'
+    project-name: 'ccsdk-utils'
+    branch: 'master'
+    mvn-settings: 'ccsdk-utils-settings'
+
index 52c496d..04b2f36 100644 (file)
     archive-artifacts: '**/*.log'
 
     build-node: centos7-builder-2c-1g
-    build-timeout: 60
+    build-timeout: 90
 
     platforms:
-      - centos-7
-      - centos-7-arm64
       - ubuntu-16.04
       - ubuntu-18.04-arm64
     templates: docker
index ea55652..c590426 100644 (file)
@@ -4,8 +4,6 @@
     name: clamp
     project-name: 'clamp'
     jobs:
-      - gerrit-maven-clm:
-         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
       - '{project-name}-{stream}-verify-java-checkstyle':
          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
       - '{project-name}-{stream}-merge-properties-java':
     mvn-settings: 'clamp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: clamp-clm
+    jobs:
+      - gerrit-maven-clm:
+         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+    project: 'clamp'
+    project-name: 'clamp'
+    branch: 'master'
+    mvn-settings: 'clamp-settings'
+    build-node: ubuntu1604-docker-8c-8g
+
index 87b03b4..8522709 100644 (file)
@@ -4,7 +4,6 @@
     name: cli
     project-name: 'cli'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'cli-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: cli-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'cli'
+    project-name: 'cli'
+    branch: 'master'
+    mvn-settings: 'cli-settings'
+    build-node: ubuntu1604-builder-4c-4g
index c3d7720..79bb19f 100644 (file)
@@ -18,7 +18,6 @@
     build-node: ubuntu1604-builder-4c-4g
 
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-verify-java':
           mvn-params: '-DskipTests=true'
     mvn-settings: 'dcaegen2-analytics-tca-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-analytics-tca-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'dcaegen2/analytics/tca'
+    project-name: 'dcaegen2-analytics-tca'
+    branch: 'master'
+    build-node: ubuntu1604-builder-4c-4g
+    mvn-settings: 'dcaegen2-analytics-tca-settings'
index f127a49..904f749 100644 (file)
@@ -15,7 +15,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
 
     mvn-settings: 'dcaegen2-analytics-pnda-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-analytics-pnda-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/analytics/pnda
+    build-node: ubuntu1604-builder-4c-4g
+    project-name: 'dcaegen2-analytics-pnda'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-analytics-pnda-settings'
index 47b0d58..82129ef 100644 (file)
@@ -15,7 +15,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java':
       - '{project-name}-{stream}-merge-java':
           mvn-goals: 'clean install'
     mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-analytics-tca-gen2-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/analytics/tca-gen2
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-analytics-tca-gen2'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
index 165295e..8a230b2 100644 (file)
@@ -15,7 +15,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-verify-java':
           mvn-goals: 'clean install'
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-collectors-datafile-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/collectors/datafile
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-collectors-datafile'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-collectors-datafile-settings'
index 2508076..b9caca7 100644 (file)
@@ -15,7 +15,6 @@
     archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html'
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java':
           mvn-goals: 'clean install'
       - '{project-name}-{stream}-merge-java':
           # No-op
           script: '/bin/true'
 
+- project:
+    name: dcaegen2-collectors-hv-ves-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/collectors/hv-ves
+    project-name: 'dcaegen2-collectors-hv-ves'
+    branch: 'master'
+    build-node: ubuntu1604-docker-8c-8g
+    mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
index 812b22f..4aa9a8c 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-collectors-restconf
     project-name: 'dcaegen2-collectors-restconf'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dcaegen2-collectors-restconf-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-collectors-restconf-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/collectors/restconf
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-collectors-restconf'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-collectors-restconf-settings'
index f74f6c0..b0fe678 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-collectors-snmptrap
     project-name: 'dcaegen2-collectors-snmptrap'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-collectors-snmptrap-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/collectors/snmptrap
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-collectors-snmptrap'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
index 841395e..0056c59 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-collectors-ves
     project-name: 'dcaegen2-collectors-ves'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dcaegen2-collectors-ves-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-collectors-ves-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/collectors/ves
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-collectors-ves'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-collectors-ves-settings'
index 6ffa6b4..648643e 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-deployments
     project-name: 'dcaegen2-deployments'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
     build-timeout: 180
+
+- project:
+    name: dcaegen2-deployments-clm
+    jobs:
+      - gerrit-maven-clm
+    build-node: ubuntu1604-docker-8c-8g
+    project: dcaegen2/deployments
+    project-name: 'dcaegen2-deployments'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-deployments-settings'
index d459663..c76e65a 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-platform-blueprints
     project-name: 'dcaegen2-platform-blueprints'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+
+- project:
+    name: dcaegen2-platform-blueprints-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/platform/blueprints
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-platform-blueprints'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-blueprints-settings'
index c7cf8db..180195f 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-platform-cdapbroker
     project-name: 'dcaegen2-platform-cdapbroker'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+
+- project:
+    name: dcaegen2-platform-cdapbroker-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/platform/cdapbroker
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-platform-cdapbroker'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-cdapbroker-settings'
index 089e7b1..8491afb 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-platform-cli
     project-name: 'dcaegen2-platform-cli'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dcaegen2-platform-cli-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-cli-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/platform/cli
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-platform-cli'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-cli-settings'
index c84ce10..0bd986e 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-platform-configbinding
     project-name: 'dcaegen2-platform-configbinding'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dcaegen2-platform-configbinding-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-configbinding-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/platform/configbinding
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-platform-configbinding'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-configbinding-settings'
index f5dcd9d..798fbc5 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-platform-deployment-handler
     project-name: 'dcaegen2-platform-deployment-handler'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+
+- project:
+    name: dcaegen2-platform-deployment-handler-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/platform/deployment-handler
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-platform-deployment-handler'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
index bc48555..0c95824 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-platform-inventory-api
     project-name: 'dcaegen2-platform-inventory-api'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-inventory-api-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/platform/inventory-api
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-platform-inventory-api'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-inventory-api-settings'
index a68b8c7..0076299 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-platform-plugins
     project-name: 'dcaegen2-platform-plugins'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dcaegen2-platform-plugins-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-plugins-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/platform/plugins
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-platform-plugins'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-plugins-settings'
index 88cfedf..024d41c 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-platform-policy-handler
     project-name: 'dcaegen2-platform-policy-handler'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dcaegen2-platform-policy-handler-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-policy-handler-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/platform/policy-handler
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-platform-policy-handler'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-policy-handler-settings'
index 7c66bfd..69d8c95 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-platform-servicechange-handler
     project-name: 'dcaegen2-platform-servicechange-handler'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+
+- project:
+    name: dcaegen2-platform-servicechange-handler-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/platform/servicechange-handler
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-platform-servicechange-handler'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
index 017f6ad..57c0bc7 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-services-heartbeat
     project-name: 'dcaegen2-services-heartbeat'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dcaegen2-services-heartbeat-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-services-heartbeat-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/services/heartbeat
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-services-heartbeat'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-heartbeat-settings'
index b3e7184..511d932 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-services-mapper
     project-name: 'dcaegen2-services-mapper'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dcaegen2-services-mapper-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-services-mapper-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/services/mapper
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-services-mapper'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-mapper-settings'
index d151701..9fdc9f9 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2-services-prh
     project-name: 'dcaegen2-services-prh'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dcaegen2-services-prh-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-services-prh-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/services/prh
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-services-prh'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-prh-settings'
index f4f22d6..9b6cb64 100644 (file)
@@ -5,7 +5,6 @@
     python-version: python3
 
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dcaegen2-utils-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-utils-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dcaegen2/utils
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-utils'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-utils-settings'
index 0341dbf..ce552c0 100644 (file)
@@ -3,7 +3,6 @@
     name: dcaegen2
     project-name: 'dcaegen2'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+
+- project:
+    name: dcaegen2-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'dcaegen2'
+    project-name: 'dcaegen2'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-settings'
index 2af0e8d..21077e6 100644 (file)
@@ -4,7 +4,6 @@
     name: dmaap-buscontroller
     project-name: 'dmaap-buscontroller'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
 
 # removed sonar job from this template because this repo only builds a docker container
 # and the 0% coverage report from Sonar was causing repeated escalations.
+
+- project:
+    name: dmaap-buscontroller-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/buscontroller
+    project-name: 'dmaap-buscontroller'
+    branch: 'master'
+    mvn-settings: 'dmaap-buscontroller-settings'
index 3f94599..516d7eb 100644 (file)
@@ -2,7 +2,6 @@
     name: dmaap-datarouter
     project-name: 'dmaap-datarouter'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+- project:
+    name: dmaap-datarouter-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/datarouter
+    project-name: 'dmaap-datarouter'
+    branch: 'master'
+    mvn-settings: 'dmaap-datarouter-settings'
index e52b09f..d4fb4a1 100644 (file)
@@ -3,7 +3,6 @@
     name: dmaap-dbcapi
     project-name: 'dmaap-dbcapi'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dmaap-dbcapi-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dmaap-dbcapi-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/dbcapi
+    project-name: 'dmaap-dbcapi'
+    branch: 'master'
+    mvn-settings: 'dmaap-dbcapi-settings'
index 7efe1ef..85ff59f 100644 (file)
@@ -3,7 +3,6 @@
     name: dmaap-messagerouter-dmaapclient
     project-name: 'dmaap-messagerouter-dmaapclient'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dmaap-messagerouter-dmaapclient-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/messagerouter/dmaapclient
+    project-name: 'dmaap-messagerouter-dmaapclient'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
index 18d9d1c..ff58473 100644 (file)
@@ -4,7 +4,6 @@
     name: dmaap-messagerouter-docker
     project-name: 'dmaap-messagerouter-docker'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-docker-version-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
       - '{project-name}-{stream}-docker-java-daily':
     docker-pom: 'pom.xml'
     mvn-profile: 'docker'
     build-node: ubuntu1604-docker-8c-8g
+
+- project:
+    name: dmaap-messagerouter-docker-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/messagerouter/messageservice
+    project-name: 'dmaap-messagerouter-docker'
+    build-node: ubuntu1604-docker-8c-8g
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
index 914e994..1ff349c 100644 (file)
@@ -3,7 +3,6 @@
     name: dmaap-messagerouter-messageservice
     project-name: 'dmaap-messagerouter-messageservice'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dmaap-messagerouter-messageservice-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/messagerouter/messageservice
+    project-name: 'dmaap-messagerouter-messageservice'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
index 1f888b1..3ec04eb 100644 (file)
@@ -3,7 +3,6 @@
     name: dmaap-messagerouter-mirroragent
     project-name: 'dmaap-messagerouter-mirroragent'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dmaap-messagerouter-mirroragent-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/messagerouter/mirroragent
+    project-name: 'dmaap-messagerouter-mirroragent'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
index 388ecfb..fdd472d 100644 (file)
@@ -3,7 +3,6 @@
     name: dmaap-messagerouter-msgrtr
     project-name: 'dmaap-messagerouter-msgrtr'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dmaap-messagerouter-msgrtr-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/messagerouter/msgrtr
+    project-name: 'dmaap-messagerouter-msgrtr'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
index f6b05b5..b160f2a 100644 (file)
@@ -3,7 +3,6 @@
     name: externalapi-nbi
     project-name: 'externalapi-nbi'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+- project:
+    name: externalapi-nbi-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'externalapi/nbi'
+    project-name: 'externalapi-nbi'
+    branch: 'master'
+    mvn-settings: 'externalapi-nbi-settings'
+
 - project:
     name: externalapi-nbi-sonar
     jobs:
diff --git a/jjb/global-jjb b/jjb/global-jjb
deleted file mode 160000 (submodule)
index 75cd590..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 75cd5909da184179c77a55d1909f7159d9eea34b
diff --git a/jjb/global-jjb/jenkins-admin b/jjb/global-jjb/jenkins-admin
new file mode 120000 (symlink)
index 0000000..8e7fe05
--- /dev/null
@@ -0,0 +1 @@
+../../global-jjb/jenkins-admin
\ No newline at end of file
diff --git a/jjb/global-jjb/jenkins-init-scripts b/jjb/global-jjb/jenkins-init-scripts
new file mode 120000 (symlink)
index 0000000..c7c6a95
--- /dev/null
@@ -0,0 +1 @@
+../../global-jjb/jenkins-init-scripts
\ No newline at end of file
diff --git a/jjb/global-jjb/jjb b/jjb/global-jjb/jjb
new file mode 120000 (symlink)
index 0000000..23c884f
--- /dev/null
@@ -0,0 +1 @@
+../../global-jjb/jjb
\ No newline at end of file
diff --git a/jjb/global-jjb/shell b/jjb/global-jjb/shell
new file mode 120000 (symlink)
index 0000000..d37c43f
--- /dev/null
@@ -0,0 +1 @@
+../../global-jjb/shell
\ No newline at end of file
index d32e53d..b7a56af 100644 (file)
           fail: true
 
 - wrapper:
-    name: golang
+    name: golang110
     wrappers:
       - raw:
           xml: |
             <goVersion>Golang 1.10</goVersion>
             </org.jenkinsci.plugins.golang.GolangBuildWrapper>
 
+- wrapper:
+    name: golang111
+    wrappers:
+      - raw:
+          xml: |
+            <org.jenkinsci.plugins.golang.GolangBuildWrapper plugin="golang@1.2">
+            <goVersion>Golang 1.11</goVersion>
+            </org.jenkinsci.plugins.golang.GolangBuildWrapper>
+
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
     # needed by the eCOMP infra.
index 69aadc8..9f9bdf9 100644 (file)
@@ -44,6 +44,7 @@
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - shell: '{script}'
 
     publishers:
@@ -93,6 +94,7 @@
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
index 8d1c40d..3052dc2 100644 (file)
     <<: *docker_merge_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
     <<: *docker_merge_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
     <<: *docker_verify_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
     <<: *docker_verify_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
     <<: *docker_merge_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
     <<: *docker_merge_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
     <<: *docker_verify_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
     <<: *docker_verify_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
index a3182cc..ba2f74e 100644 (file)
@@ -5,11 +5,16 @@
     # The purpose of this job template is to run:
     # 1. make build
     #
+    # golangver can be set to golang110 or golang111
+    # depending on what version is needed by the project
+    # default is golang110
+    #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
 
     name: '{project-name}-{stream}-verify-golang'
     path: '$WORKSPACE'
+    golangver: 'golang110'
 
     project-type: freestyle
     concurrent: true
@@ -33,7 +38,7 @@
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - golang
+      - '{golangver}'
       - infra-wrappers:
           build-timeout: '{build-timeout}'
 
@@ -45,6 +50,7 @@
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
     # The purpose of this job template is to run:
     # 1. make deploy
     #
+    # golangver can be set to golang110 or golang111
+    # depending on what version is needed by the project
+    # default is golang110
+    #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
 
     name: '{project-name}-{stream}-merge-golang'
     path: $WORKSPACE
+    golangver: 'golang110'
 
     project-type: freestyle
     node: '{build-node}'
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - golang
+      - '{golangver}'
       - infra-wrappers:
           build-timeout: '{build-timeout}'
 
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
 - job-template:
     # Job template for building & pushing docker images
     #
+    # golangver can be set to golang110 or golang111
+    # depending on what version is needed by the project
+    # default is golang110
+    #
     # The purpose of this job template is to run:
     #  1. login to the docker registry
     #  2. run a specified shell builder
     #
 
     name: '{project-name}-{stream}-docker-golang-shell-daily'
+    golangver: 'golang110'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
     disabled: false
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - golang
+      - '{golangver}'
       - infra-wrappers:
           build-timeout: '{build-timeout}'
 
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
 
     publishers:
       - infra-shiplogs:
-          maven-version: '{maven-version}'
\ No newline at end of file
+          maven-version: '{maven-version}'
index 79a0077..664d14e 100644 (file)
@@ -67,6 +67,7 @@
           files: '{files}'
 
     builders:
+      - lf-infra-pre-build
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
 
@@ -90,6 +91,7 @@
           files: '{files}'
 
     builders:
+      - lf-infra-pre-build
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
                 comment-contains-value: '^stage-helm$'
 
     builders:
+      - lf-infra-pre-build
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
 
     disabled: true
     builders:
+      - lf-infra-pre-build
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
 
     disabled: true
     builders:
+      - lf-infra-pre-build
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
index 8f17a25..61da2d5 100644 (file)
@@ -49,6 +49,7 @@
           files: '{obj:pattern}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           project: '{project}'
           branch: '{branch}'
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           files: '{pattern}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
     name: '{project-name}-{stream}-merge-profile-java'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           branch: '{branch}'
 
     builders:
-
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           project: '{project}'
           branch: '{branch}'
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           branch: '{branch}'
 
     builders:
-
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           branch: '{branch}'
 
     builders:
-
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           branch: '{branch}'
 
     builders:
-
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           branch: '{branch}'
 
     builders:
-
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           branch: '{branch}'
 
     builders:
-
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           branch: '{branch}'
 
     builders:
-
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
     build-timeout: 120
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
index 80ae84b..b30af0e 100644 (file)
@@ -53,6 +53,7 @@
           files: '{pattern}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
index 9264bc9..fcbf745 100644 (file)
@@ -47,6 +47,7 @@
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
index 9d7f34b..559f1d5 100644 (file)
@@ -3,7 +3,6 @@
     name: holmes-common
     project-name: 'holmes-common'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'holmes-common-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: holmes-common-clm
+    jobs:
+      - gerrit-maven-clm
+    project: holmes/common
+    project-name: 'holmes-common'
+    branch: 'master'
+    mvn-settings: 'holmes-common-settings'
index 8a014be..79b4fe6 100644 (file)
@@ -3,7 +3,6 @@
     name: holmes-dsa
     project-name: 'holmes-dsa'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'holmes-dsa-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: holmes-dsa-clm
+    jobs:
+      - gerrit-maven-clm
+    project: holmes/dsa
+    project-name: 'holmes-dsa'
+    branch: 'master'
+    mvn-settings: 'holmes-dsa-settings'
index cd4e71c..77888cc 100644 (file)
@@ -3,7 +3,6 @@
     name: holmes-engine-management
     project-name: 'holmes-engine-management'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'holmes-engine-management-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: holmes-engine-management-clm
+    jobs:
+      - gerrit-maven-clm
+    project: holmes/engine-management
+    project-name: 'holmes-engine-management'
+    branch: 'master'
+    mvn-settings: 'holmes-engine-management-settings'
index ee78158..42d14da 100644 (file)
@@ -3,7 +3,6 @@
     name: holmes-rule-management
     project-name: 'holmes-rule-management'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'holmes-rule-management-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: holmes-rule-management-clm
+    jobs:
+      - gerrit-maven-clm
+    project: holmes/rule-management
+    project-name: 'holmes-rule-management'
+    branch: 'master'
+    mvn-settings: 'holmes-rule-management-settings'
index e97f0ab..65f1664 100644 (file)
@@ -3,8 +3,6 @@
     name: integration
     project-name: 'integration'
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f version-manifest/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: integration-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-f version-manifest/pom.xml'
+    project: integration
+    project-name: 'integration'
+    branch: 'master'
+    mvn-settings: 'integration-settings'
index 6c4f3be..6720c95 100644 (file)
@@ -3,7 +3,6 @@
     name: logging-analytics-pomba-pomba-aai-context-builder
     project-name: logging-analytics-pomba-pomba-aai-context-builder
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - gerrit-info-yaml-verify
     project: 'logging-analytics/pomba/pomba-aai-context-builder'
     branch: 'master'
+
+- project:
+    name: logging-analytics-pomba-pomba-aai-context-builder-clm
+    jobs:
+      - gerrit-maven-clm
+    project: logging-analytics/pomba/pomba-aai-context-builder
+    project-name: logging-analytics-pomba-pomba-aai-context-builder
+    branch: 'master'
+    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
index dc7979b..8b84dc1 100644 (file)
@@ -3,7 +3,6 @@
     name: logging-analytics-pomba-pomba-audit-common
     project-name: logging-analytics-pomba-pomba-audit-common
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - gerrit-info-yaml-verify
     project: 'logging-analytics/pomba/pomba-audit-common'
     branch: 'master'
+
+- project:
+    name: logging-analytics-pomba-pomba-audit-common-clm
+    jobs:
+      - gerrit-maven-clm
+    project: logging-analytics/pomba/pomba-audit-common
+    project-name: logging-analytics-pomba-pomba-audit-common
+    branch: 'master'
+    mvn-settings: logging-analytics-pomba-pomba-audit-common-settings
index 18f1869..e398f8c 100644 (file)
@@ -3,7 +3,6 @@
     name: logging-analytics-pomba-pomba-context-aggregator
     project-name: logging-analytics-pomba-pomba-context-aggregator
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - gerrit-info-yaml-verify
     project: 'logging-analytics/pomba/pomba-context-aggregator'
     branch: 'master'
+
+- project:
+    name: logging-analytics-pomba-pomba-context-aggregator-clm
+    jobs:
+      - gerrit-maven-clm
+    project: logging-analytics/pomba/pomba-context-aggregator
+    project-name: logging-analytics-pomba-pomba-context-aggregator
+    branch: 'master'
+    mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
index ae10c44..8bf521c 100644 (file)
@@ -3,7 +3,6 @@
     name: logging-analytics-pomba-pomba-network-discovery-context-builder
     project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - gerrit-info-yaml-verify
     project: 'logging-analytics/pomba/pomba-network-discovery-context-builder'
     branch: 'master'
+
+- project:
+    name: logging-analytics-pomba-pomba-network-discovery-context-builder-clm
+    jobs:
+      - gerrit-maven-clm
+    project: logging-analytics/pomba/pomba-network-discovery-context-builder
+    project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
+    branch: 'master'
+    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
index 96d60eb..1fb2619 100644 (file)
@@ -3,7 +3,6 @@
     name: logging-analytics-pomba-pomba-sdc-context-builder
     project-name: logging-analytics-pomba-pomba-sdc-context-builder
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - gerrit-info-yaml-verify
     project: 'logging-analytics/pomba/pomba-sdc-context-builder'
     branch: 'master'
+
+- project:
+    name: logging-analytics-pomba-pomba-sdc-context-builder-clm
+    jobs:
+      - gerrit-maven-clm
+    project: logging-analytics/pomba/pomba-sdc-context-builder
+    project-name: logging-analytics-pomba-pomba-sdc-context-builder
+    branch: 'master'
+    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
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
new file mode 100644 (file)
index 0000000..230a510
--- /dev/null
@@ -0,0 +1,49 @@
+---
+- project:
+    name: logging-analytics-pomba-pomba-sdnc-context-builder
+    project-name: logging-analytics-pomba-pomba-sdnc-context-builder
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{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'
+    project: logging-analytics/pomba/pomba-sdnc-context-builder
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: logging-analytics-pomba-pomba-sdnc-context-builder-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: logging-analytics/pomba/pomba-sdnc-context-builder
+    project-name: logging-analytics-pomba-pomba-sdnc-context-builder
+    branch: master
+    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: logging-analytics-pomba-pomba-sdnc-context-builder-info
+    project-name: 'logging-analytics-pomba-pomba-sdnc-context-builder'
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'logging-analytics/pomba/pomba-sdnc-context-builder'
+    branch: 'master'
+
+- project:
+    name: logging-analytics-pomba-pomba-sdnc-context-builder-clm
+    jobs:
+      - gerrit-maven-clm
+    project: logging-analytics/pomba/pomba-sdnc-context-builder
+    project-name: logging-analytics-pomba-pomba-sdnc-context-builder
+    branch: 'master'
+    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
index 20d8618..8038684 100644 (file)
@@ -3,7 +3,6 @@
     name: logging-analytics
     project-name: 'logging-analytics'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - gerrit-info-yaml-verify
     project: 'logging-analytics'
     branch: 'master'
+
+- project:
+    name: logging-analytics-clm
+    jobs:
+      - gerrit-maven-clm
+    project: logging-analytics
+    project-name: 'logging-analytics'
+    branch: 'master'
+    mvn-settings: 'logging-analytics-settings'
index 798ee14..03bc2d9 100644 (file)
@@ -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'
     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'
index 25a72c7..e10e24d 100644 (file)
@@ -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'
     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'
index e855453..43a8a08 100644 (file)
@@ -3,7 +3,6 @@
     name: msb-apigateway
     project-name: 'msb-apigateway'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'msb-apigateway-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: msb-apigateway-clm
+    jobs:
+      - gerrit-maven-clm
+    project: msb/apigateway
+    project-name: 'msb-apigateway'
+    branch: 'master'
+    mvn-settings: 'msb-apigateway-settings'
index afbd9bd..3ffdc22 100644 (file)
@@ -3,7 +3,6 @@
     name: msb-discovery
     project-name: 'msb-discovery'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'msb-discovery-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: msb-discovery-clm
+    jobs:
+      - gerrit-maven-clm
+    project: msb/discovery
+    project-name: 'msb-discovery'
+    branch: 'master'
+    mvn-settings: 'msb-discovery-settings'
index ab73827..3029362 100644 (file)
@@ -3,7 +3,6 @@
     name: msb-java-sdk
     project-name: 'msb-java-sdk'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'msb-java-sdk-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: msb-java-sdk-clm
+    jobs:
+      - gerrit-maven-clm
+    project: msb/java-sdk
+    project-name: 'msb-java-sdk'
+    branch: 'master'
+    mvn-settings: 'msb-java-sdk-settings'
index 53b4e14..8533676 100644 (file)
@@ -3,7 +3,6 @@
     name: msb-swagger-sdk
     project-name: 'msb-swagger-sdk'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'msb-swagger-sdk-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: msb-swagger-sdk-clm
+    jobs:
+      - gerrit-maven-clm
+    project: msb/swagger-sdk
+    project-name: 'msb-swagger-sdk'
+    branch: 'master'
+    mvn-settings: 'msb-swagger-sdk-settings'
diff --git a/jjb/multicloud/build-multicloud-k8s-docker-image.sh b/jjb/multicloud/build-multicloud-k8s-docker-image.sh
new file mode 100755 (executable)
index 0000000..af19340
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/bash
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 Intel Corporation
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+set -o xtrace
+
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+cd ./deployments
+./build.sh
similarity index 54%
rename from jjb/portal-sdk/portal-sdk-csit.yaml
rename to jjb/multicloud/multicloud-azure-csit.yaml
index c5667e6..1094631 100644 (file)
@@ -1,12 +1,13 @@
+---
 - project:
-    name: portal-sdk-csit
+    name: multicloud-azure-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'portal-sdk'
+    project-name: 'multicloud-azure'
     stream: 'master'
     functionality:
-      - 'testsuite':
-          trigger_jobs: 'portal-docker-{stream}-merge-docker-script'
+      - 'functionality1':
+          trigger_jobs: 'multicloud-azure-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
index f9e94f9..b4590be 100644 (file)
@@ -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'
     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'
index 8f20092..8da6ac9 100644 (file)
@@ -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'
     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'
index 94595ed..00ac9f7 100644 (file)
@@ -7,6 +7,9 @@
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-verify-golang'
       - '{project-name}-{stream}-merge-golang'
+      - '{project-name}-{stream}-docker-golang-shell-daily':
+          script:
+            !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
     project: 'multicloud/k8s'
     subproject:
       - validation-scripts:
index 00f6d02..0743a24 100644 (file)
@@ -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'
     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'
index d6cc74d..0ff1cc5 100644 (file)
@@ -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'
     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'
index 457042a..6f83f0f 100644 (file)
@@ -7,8 +7,6 @@
           pom: 'jar/pom.xml'
           pattern: 'jar/**'
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f jar/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
     project: 'music'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+
+- project:
+    name: music-jar-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-f jar/pom.xml'
+    project: music
+    project-name: 'music-jar'
+    branch: 'master'
+    mvn-settings: 'music-settings'
index 3e2031a..1e48b35 100644 (file)
@@ -3,7 +3,6 @@
     name: music-prom
     project-name: 'music-prom'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+
+- project:
+    name: music-prom-clm
+    jobs:
+      - gerrit-maven-clm
+    project: music/prom
+    project-name: 'music-prom'
+    branch: 'master'
+    mvn-settings: 'music-prom-settings'
index aa52bec..bf33832 100644 (file)
@@ -7,8 +7,6 @@
           pom: 'musictrigger/pom.xml'
           pattern: 'musictrigger/**'
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f musictrigger/pom.xml assembly:single'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
     project: 'music'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+
+- project:
+    name: music-trigger-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-f musictrigger/pom.xml assembly:single'
+    project: music
+    project-name: 'music-trigger'
+    branch: 'master'
+    mvn-settings: 'music-settings'
index 2fe2702..43fe665 100644 (file)
@@ -3,7 +3,6 @@
     name: music
     project-name: 'music'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+
+- project:
+    name: music-clm
+    jobs:
+      - gerrit-maven-clm
+    project: music
+    project-name: 'music'
+    branch: 'master'
+    mvn-settings: 'music-settings'
index 725c67e..060ffb7 100644 (file)
@@ -3,7 +3,6 @@
     name: oom-registrator
     project-name: 'oom-registrator'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: oom-registrator-clm
+    jobs:
+      - gerrit-maven-clm
+    project: oom/registrator
+    project-name: 'oom-registrator'
+    branch: 'master'
+    mvn-settings: 'oom-registrator-settings'
index 4d15713..f2be369 100644 (file)
@@ -3,7 +3,6 @@
     name: oparent
     project-name: 'oparent'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: oparent-clm
+    jobs:
+      - gerrit-maven-clm
+    project: oparent
+    project-name: 'oparent'
+    branch: 'master'
+    mvn-settings: 'oparent-settings'
index e6ef1f9..77d797a 100644 (file)
@@ -1,64 +1,60 @@
----\r
-- project:\r
-    name: optf-cmso\r
-    project-name: 'optf-cmso'\r
-    project: 'optf/cmso'\r
-    stream:\r
-      - 'master':\r
-          branch: 'master'\r
-    mvn-settings: 'optf-cmso-settings'\r
-    subproject:\r
-      - 'cmso':\r
-          path: '.'\r
-          pattern: '**'\r
-          pom: 'pom.xml'\r
-    jobs:\r
-      - gerrit-maven-clm\r
-      - '{project-name}-{stream}-{subproject}-verify-java'\r
-      - '{project-name}-{stream}-{subproject}-merge-java'\r
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'\r
-    files: '**'\r
-    archive-artifacts: ''\r
-    build-node: 'ubuntu1604-builder-4c-4g'\r
-\r
-- project:\r
-    name: optf-cmso-docker\r
-    project-name: 'optf-cmso'\r
-    project: 'optf/cmso'\r
-    stream:\r
-      - 'master':\r
-          branch: 'master'\r
-    mvn-settings: 'optf-cmso-settings'\r
-    subproject:\r
-      - 'cmso':\r
-          path: '.'\r
-          pattern: '**'\r
-          pom: 'pom.xml'\r
-    jobs:\r
-      - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':\r
-          docker-pom: 'pom.xml'\r
-          mvn-goals: 'install'\r
-          mvn-params: '-Dmaven.test.skip=true'\r
-          script:\r
-            !include-raw-escape: 'build-optf-cmso-docker-image.sh'\r
-          build-node: queue-docker-4c-4g\r
-      - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':\r
-          docker-pom: 'pom.xml'\r
-          mvn-goals: 'install'\r
-          mvn-params: '-Dmaven.test.skip=true'\r
-          script:\r
-            !include-raw-escape: 'build-optf-cmso-docker-image.sh'\r
-          build-node: queue-docker-4c-4g\r
-\r
-- project:\r
-    name: optf-cmso-sonar\r
-    jobs:\r
-      - gerrit-maven-sonar\r
-    cron: 'H 11 * * *'\r
-    build-node: ubuntu1604-builder-4c-4g\r
-    project: 'optf/cmso'\r
-    project-name: 'optf-cmso'\r
-    branch: 'master'\r
-    mvn-settings: 'optf-cmso-settings'\r
-    mvn-goals: 'clean install'\r
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'\r
+---
+
+- project:
+    name: optf-cmso
+    project-name: 'optf-cmso'
+    jobs:
+      - '{project-name}-{stream}-verify-java-checkstyle':
+         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+      - '{project-name}-{stream}-merge-properties-java':
+         mvn_properties:
+            - docker.pull.registry=nexus3.onap.org:10001
+            - docker.push.registry=nexus3.onap.org:10003
+      - '{project-name}-{stream}-release-java-daily-checkstyle':
+         setVersion: 'DoSetVersion'
+         mvn_properties:
+          - docker.pull.registry=nexus3.onap.org:10001
+      - '{project-name}-{stream}-docker-java-properties-daily':
+         setVersion: 'DoSetVersion'
+         docker-pom: 'pom.xml'
+         mvn-profile: 'docker'
+         mvn-params: '-Dmaven.test.skip=true'
+         maven-properties: |
+          cmso.registry=$
+
+    build-node: ubuntu1604-docker-8c-8g
+    project: 'optf/cmso'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'optf-cmso-settings'
+    subproject:
+      - 'cmso':
+          path: '.'
+          pattern: '**'
+          pom: 'pom.xml'
+
+- project:
+    name: optf-cmso-sonar
+    jobs:
+      - gerrit-maven-sonar:
+          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-docker-8c-8g
+    project: 'optf/cmso'
+    project-name: 'optf-cmso'
+    branch: 'master'
+    mvn-settings: 'optf-cmso-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: optf-cmso-clm
+    jobs:
+      - gerrit-maven-clm:
+         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+    project: optf/cmso
+    project-name: 'optf-cmso'
+    build-node: ubuntu1604-docker-8c-8g
+    branch: 'master'
+    mvn-settings: 'optf-cmso-settings'
index 6860822..945e3d2 100644 (file)
@@ -15,7 +15,6 @@
           pattern: 'conductor/**'
           pom: 'pom.xml'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-verify-java'
     mvn-settings: 'optf-has-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: optf-has-clm
+    jobs:
+      - gerrit-maven-clm
+    project: optf/has
+    project-name: 'optf-has'
+    branch: 'master'
+    mvn-settings: 'optf-has-settings'
index 8cc048d..6c6e2fc 100644 (file)
@@ -15,7 +15,6 @@
           pattern: '**'
           pom: 'pom.xml'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
     mvn-settings: 'optf-osdf-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: optf-osdf-clm
+    jobs:
+      - gerrit-maven-clm
+    project: optf/osdf
+    project-name: 'optf-osdf'
+    branch: 'master'
+    mvn-settings: 'optf-osdf-settings'
index 7b490cb..788f0e7 100644 (file)
@@ -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
     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'
index 29977b9..e8b5658 100644 (file)
@@ -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'
 
     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'
index 8607d28..6613576 100644 (file)
@@ -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':
     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'
index 1506f6c..4f457eb 100644 (file)
@@ -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'
 
     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'
index bc5bcc6..53fc510 100644 (file)
@@ -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'
     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'
index 04f5ef3..31f9ba9 100644 (file)
@@ -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':
     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'
index cb125b0..717eedc 100644 (file)
@@ -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
     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'
index f116f7b..0dc51b1 100644 (file)
@@ -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
     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'
index 43a35c5..40b9dc1 100644 (file)
@@ -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'
 
     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'
index 60d4881..e8513be 100644 (file)
@@ -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'
 
     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'
index ad789b2..13f2701 100644 (file)
@@ -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'
 
     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'
index 13e97a6..34f3578 100644 (file)
@@ -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'
     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'
index f124bb4..2d299b4 100644 (file)
@@ -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'
 
     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'
index 8da603c..0b45026 100644 (file)
@@ -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'
 
     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'
index b5fab5f..af32f07 100644 (file)
@@ -9,8 +9,6 @@
     subproject-name: 'onap-sdk'
 
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f ecomp-sdk/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-java-daily'
     stream:
       - 'master':
           branch: 'master'
-      - 'release-2.1.0':
-          branch: 'release-2.1.0'
-      - 'release-2.1.1':
-          branch: 'release-2.1.1'
-      - 'release-2.2.0':
-          branch: 'release-2.2.0'
-      - 'release-2.3.0':
-          branch: 'release-2.3.0'
       - 'release-2.4.0':
           branch: 'release-2.4.0'
     mvn-settings: 'portal-sdk-settings'
     mvn-settings: 'portal-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: portal-sdk-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-f ecomp-sdk/pom.xml'
+    project: portal/sdk
+    project-name: 'portal-sdk'
+    branch: 'master'
+    mvn-settings: 'portal-sdk-settings'
diff --git a/jjb/portal/portal-csit.yaml b/jjb/portal/portal-csit.yaml
deleted file mode 100644 (file)
index 697db46..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: portal-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'portal'
-    stream: 'master'
-    functionality:
-      - 'testsuite':
-          trigger_jobs: 'portal-docker-{stream}-merge-docker-script'
-    robot-options: ''
-    branch: 'master'
index 2e2f713..400509d 100644 (file)
@@ -3,7 +3,6 @@
     name: portal
     project-name: 'portal'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-release-java-daily'
     project: 'portal'
     stream:
     mvn-settings: 'portal-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: portal-clm
+    jobs:
+      - gerrit-maven-clm
+    project: portal
+    project-name: 'portal'
+    branch: 'master'
+    mvn-settings: 'portal-settings'
index a43ad63..595f863 100644 (file)
@@ -3,7 +3,6 @@
     name: sdc-dcae-d-ci
     project-name: 'sdc-dcae-d-ci'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+
+- project:
+    name: sdc-dcae-d-ci-clm
+    jobs:
+      - gerrit-maven-clm
+    project: sdc/dcae-d/ci
+    project-name: 'sdc-dcae-d-ci'
+    branch: 'master'
+    mvn-settings: 'sdc-dcae-d-ci-settings'
index 9980935..5d0f4b6 100644 (file)
@@ -3,7 +3,6 @@
     name: sdc-dcae-d-dt-be-main
     project-name: 'sdc-dcae-d-dt-be-main'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+
+- project:
+    name: sdc-dcae-d-dt-be-main-clm
+    jobs:
+      - gerrit-maven-clm
+    project: sdc/dcae-d/dt-be-main
+    project-name: 'sdc-dcae-d-dt-be-main'
+    branch: 'master'
+    mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
index a60e6dd..0e642df 100644 (file)
@@ -3,7 +3,6 @@
     name: sdc-dcae-d-dt-be-property
     project-name: 'sdc-dcae-d-dt-be-property'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+
+- project:
+    name: sdc-dcae-d-dt-be-property-clm
+    jobs:
+      - gerrit-maven-clm
+    project: sdc/dcae-d/dt-be-property
+    project-name: 'sdc-dcae-d-dt-be-property'
+    branch: 'master'
+    mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
index 58d7331..5e5183d 100644 (file)
@@ -4,7 +4,6 @@
     project-name: 'sdc-dcae-d-dt'
     build-node: ubuntu1604-builder-4c-2g
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+
+- project:
+    name: sdc-dcae-d-dt-clm
+    jobs:
+      - gerrit-maven-clm
+    project: sdc/dcae-d/dt
+    project-name: 'sdc-dcae-d-dt'
+    build-node: ubuntu1604-builder-4c-2g
+    branch: 'master'
+    mvn-settings: 'sdc-dcae-d-dt-settings'
index d92bd53..c869906 100644 (file)
@@ -4,7 +4,6 @@
     project-name: 'sdc-dcae-d-fe'
     build-node: ubuntu1604-builder-4c-2g
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+
+- project:
+    name: sdc-dcae-d-fe-clm
+    jobs:
+      - gerrit-maven-clm
+    project: sdc/dcae-d/fe
+    project-name: 'sdc-dcae-d-fe'
+    build-node: ubuntu1604-builder-4c-2g
+    branch: 'master'
+    mvn-settings: 'sdc-dcae-d-fe-settings'
index 5e37e14..2ff77ed 100644 (file)
@@ -4,7 +4,6 @@
     name: sdc-jtosca
     project-name: 'sdc-jtosca'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+
+- project:
+    name: sdc-jtosca-clm
+    jobs:
+      - gerrit-maven-clm
+    project: sdc/jtosca
+    project-name: 'sdc-jtosca'
+    branch: 'master'
+    mvn-settings: 'sdc-jtosca-settings'
index 27bf97f..4bf13dc 100644 (file)
@@ -4,7 +4,6 @@
     name: sdc-sdc-distribution-client
     project-name: 'sdc-sdc-distribution-client'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+
+- project:
+    name: sdc-sdc-distribution-client-clm
+    jobs:
+      - gerrit-maven-clm
+    project: sdc/sdc-distribution-client
+    project-name: 'sdc-sdc-distribution-client'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-distribution-client-settings'
index 128f02c..5b7d937 100644 (file)
@@ -4,7 +4,6 @@
     name: sdc-sdc-titan-cassandra
     project-name: 'sdc-sdc-titan-cassandra'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
     archive-artifacts: ''
     build-timeout: 60
     maven-version: 'mvn35'
+
+- project:
+    name: sdc-sdc-titan-cassandra-clm
+    jobs:
+      - gerrit-maven-clm
+    project: sdc/sdc-titan-cassandra
+    project-name: 'sdc-sdc-titan-cassandra'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-titan-cassandra-settings'
index 5f3c2df..4f0c301 100644 (file)
@@ -4,7 +4,6 @@
     name: sdc-sdc-tosca
     project-name: 'sdc-sdc-tosca'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+
+- project:
+    name: sdc-sdc-tosca-clm
+    jobs:
+      - gerrit-maven-clm
+    project: sdc/sdc-tosca
+    project-name: 'sdc-sdc-tosca'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-tosca-settings'
index 3d3af1d..e4524e7 100644 (file)
@@ -3,7 +3,6 @@
     name: sdc-sdc-workflow-designer
     project-name: 'sdc-sdc-workflow-designer'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+
+- project:
+    name: sdc-sdc-workflow-designer-clm
+    jobs:
+      - gerrit-maven-clm
+    project: sdc/sdc-workflow-designer
+    project-name: 'sdc-sdc-workflow-designer'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-workflow-designer-settings'
index bbe8a17..14b106a 100644 (file)
@@ -16,9 +16,6 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
-      - gerrit-maven-clm:
-          build-timeout: 120
-          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
     project: 'sdc'
     stream:
       - 'master':
     mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+
+- project:
+    name: sdc-clm
+    jobs:
+      - gerrit-maven-clm:
+          build-timeout: 120
+          submodule-timeout: 30
+          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+    project: sdc
+    project-name: 'sdc'
+    build-node: ubuntu1604-docker-8c-8g
+    branch: 'master'
+    mvn-settings: 'sdc-settings'
index 21ddfb0..2f00a9e 100644 (file)
@@ -3,7 +3,6 @@
     name: sdnc-apps
     project-name: 'sdnc-apps'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -12,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -40,7 +41,7 @@
     name: sdnc-apps-docker
     project-name: 'sdnc-apps'
     jobs:
-      - 'docker-java-daily':
+      - 'docker-version-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdnc-apps-settings'
     files: '**'
     archive-artifacts: ''
     build-node: queue-docker-4c-4g
 
+
+- project:
+    name: sdnc-apps-clm
+    jobs:
+      - gerrit-maven-clm
+    project: sdnc/apps
+    project-name: 'sdnc-apps'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'sdnc-apps-settings'
index 12d6975..dbbfb7c 100644 (file)
@@ -5,7 +5,11 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'sdnc'
-    stream: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
index dc82689..acfe8a8 100644 (file)
@@ -3,7 +3,6 @@
     name: sdnc-northbound
     project-name: 'sdnc-northbound'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -12,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdnc-northbound-settings'
 
     # due to a strange macro / variable translation problem this needs to be
     mvn-settings: 'sdnc-northbound-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: sdnc-northbound-clm
+    jobs:
+      - gerrit-maven-clm
+    project: sdnc/northbound
+    project-name: 'sdnc-northbound'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'sdnc-northbound-settings'
index 5c5a674..8a0433e 100644 (file)
@@ -4,7 +4,6 @@
     name: sdnc-oam
     project-name: 'sdnc-oam'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -12,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdnc-oam-settings'
     files: '**'
     archive-artifacts: ''
@@ -21,7 +22,7 @@
     name: sdnc-oam-docker
     project-name: 'sdnc-oam'
     jobs:
-      - 'docker-java-daily':
+      - 'docker-version-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdnc-oam-settings'
     files: '**'
     archive-artifacts: ''
     build-node: queue-docker-4c-4g
+
+- project:
+    name: sdnc-oam-clm
+    jobs:
+      - gerrit-maven-clm
+    project: sdnc/oam
+    project-name: 'sdnc-oam'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'sdnc-oam-settings'
index 288e6f4..b194d85 100644 (file)
@@ -5,9 +5,12 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'so'
-    stream: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     functionality:
       - 'integration-testing':
-          trigger_jobs: 'so-master-docker-version-java-daily'
+          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
     robot-options: ''
-    branch: 'master'
index 2fa46c0..6714fea 100644 (file)
@@ -3,7 +3,6 @@
     name: so-libs
     project-name: 'so-libs'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -11,8 +10,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'Dublin_dev':
-          branch: 'Dublin_dev'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'so-libs-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
     mvn-settings: 'so-libs-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: so-libs-clm
+    jobs:
+      - gerrit-maven-clm
+    project: so/libs
+    project-name: 'so-libs'
+    branch: 'master'
+    mvn-settings: 'so-libs-settings'
index a25b20b..1af2778 100644 (file)
@@ -4,7 +4,6 @@
     name: so
     project-name: 'so'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -16,8 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'Dublin_dev':
-          branch: 'Dublin_dev'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''
     mvn-settings: 'so-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: so-clm
+    jobs:
+      - gerrit-maven-clm
+    project: so
+    project-name: 'so'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'so-settings'
index aea8385..5c45b5c 100644 (file)
@@ -7,7 +7,6 @@
           path: '.'
           pattern: '**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
     project: 'testsuite/heatbridge'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: testsuite-heatbridge-master-clm
+    jobs:
+      - gerrit-maven-clm
+    project: testsuite/heatbridge
+    project-name: 'testsuite-heatbridge'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'testsuite-heatbridge-settings'
index e469c60..5818f80 100644 (file)
@@ -9,7 +9,6 @@
           branch: 'master'
     mvn-settings: 'usecase-ui-server-settings'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'usecase-ui-server-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: usecase-ui-server-clm
+    jobs:
+      - gerrit-maven-clm
+    project: usecase-ui/server
+    project-name: 'usecase-ui-server'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'usecase-ui-server-settings'
index 894be91..33a7814 100644 (file)
@@ -9,7 +9,6 @@
           branch: 'master'
     mvn-settings: 'usecase-ui-settings'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: usecase-ui-clm
+    jobs:
+      - gerrit-maven-clm
+    project: usecase-ui
+    project-name: 'usecase-ui'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'usecase-ui-settings'
index 50d8ff5..faf9d44 100644 (file)
@@ -13,7 +13,6 @@
           pom: 'lcm/pom.xml'
           pattern: 'lcm/**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'vfc-gvnfm-vnflcm-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-gvnfm-vnflcm-java-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vfc/gvnfm/vnflcm
+    project-name: 'vfc-gvnfm-vnflcm'
+    build-node: centos7-redis-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnflcm-settings'
index 817926b..f08054a 100644 (file)
@@ -12,7 +12,6 @@
           pom: 'mgr/pom.xml'
           pattern: 'mgr/**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-gvnfm-vnfmgr-java-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vfc/gvnfm/vnfmgr
+    project-name: 'vfc-gvnfm-vnfmgr'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
index d2dda94..82d31fc 100644 (file)
@@ -13,7 +13,6 @@
           pom: 'res/pom.xml'
           pattern: 'res/**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'vfc-gvnfm-vnfres-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-gvnfm-vnfres-java-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vfc/gvnfm/vnfres
+    project-name: 'vfc-gvnfm-vnfres'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnfres-settings'
index 50164ff..3587f40 100644 (file)
@@ -13,7 +13,6 @@
           path: '.'
           pattern: '**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
     mvn-settings: 'vfc-nfvo-catalog-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-nfvo-catalog-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vfc/nfvo/catalog
+    project-name: 'vfc-nfvo-catalog'
+    build-node: centos7-redis-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-catalog-settings'
index 2e8b10c..70bd630 100644 (file)
@@ -13,7 +13,6 @@
           pom: 'ems/pom.xml'
           pattern: 'ems/**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'vfc-nfvo-driver-ems-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-nfvo-driver-ems-java-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vfc/nfvo/driver/ems
+    project-name: 'vfc-nfvo-driver-ems'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-ems-settings'
index 3b09784..f754a2c 100644 (file)
@@ -12,7 +12,6 @@
           pom: 'zte/sfc-driver/pom.xml'
           pattern: 'zte/sfc-driver/**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
     mvn-settings: 'vfc-nfvo-driver-sfc-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-nfvo-driver-sfc-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vfc/nfvo/driver/sfc
+    project-name: 'vfc-nfvo-driver-sfc'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-sfc-settings'
index 1dcdb3e..86c4f7a 100644 (file)
@@ -12,8 +12,6 @@
           pom: 'huawei/pom.xml'
           pattern: 'huawei/**'
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f huawei/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-nfvo-driver-svnfm-huawei-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-f huawei/pom.xml'
+    project: vfc/nfvo/driver/vnfm/svnfm
+    project-name: 'vfc-nfvo-driver-svnfm-huawei'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
index 12ffa5d..456e381 100644 (file)
@@ -13,7 +13,6 @@
           pom: 'gvnfmadapter/pom.xml'
           pattern: 'gvnfmadapter/**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
     mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-nfvo-driver-vnfm-gvnfm-java-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vfc/nfvo/driver/vnfm/gvnfm
+    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
index 3c3601d..d32067a 100644 (file)
@@ -12,8 +12,6 @@
           pom: 'nokia/vnfmdriver/pom.xml'
           pattern: 'nokia/vnfmdriver/**'
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f nokia/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-nfvo-driver-vnfm-svnfm-nokia-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-f nokia/pom.xml'
+    project: vfc/nfvo/driver/vnfm/svnfm
+    project-name: 'vfc-nfvo-driver-svnfm-nokia'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
index 22840cd..fc8a0db 100644 (file)
@@ -12,8 +12,6 @@
           pom: 'nokiav2/pom.xml'
           pattern: 'nokiav2/**'
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f nokiav2/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
     jobs:
       - gerrit-maven-sonar
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-f nokiav2/pom.xml'
+    project: vfc/nfvo/driver/vnfm/svnfm
+    project-name: 'vfc-nfvo-driver-svnfm-nokiav2'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
index 8ff3197..f3d3764 100644 (file)
@@ -12,8 +12,6 @@
           pom: 'zte/vmanager/pom.xml'
           pattern: 'zte/vmanager/**'
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f zte/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-nfvo-driver-vnfm-svnfm-zte-java-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-f zte/pom.xml'
+    project: vfc/nfvo/driver/vnfm/svnfm
+    project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
index 743beff..25d0f05 100644 (file)
@@ -8,7 +8,6 @@
           branch: 'master'
     mvn-settings: 'vfc-nfvo-lcm-settings'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'vfc-nfvo-lcm-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-nfvo-lcm-java-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vfc/nfvo/lcm
+    project-name: 'vfc-nfvo-lcm'
+    build-node: centos7-redis-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-lcm-settings'
index f6bb29f..4ca4852 100644 (file)
@@ -9,7 +9,6 @@
           branch: 'master'
     build-node: ubuntu1604-builder-4c-4g
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'vfc-nfvo-multivimproxy-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-nfvo-multivimproxy-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vfc/nfvo/multivimproxy
+    project-name: 'vfc-nfvo-multivimproxy'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-multivimproxy-settings'
index 964ef46..ba51b7d 100644 (file)
@@ -9,7 +9,6 @@
           branch: 'master'
     build-node: ubuntu1604-builder-4c-4g
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     mvn-settings: 'vfc-nfvo-resmanagement-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-nfvo-resmanagement-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vfc/nfvo/resmanagement
+    project-name: 'vfc-nfvo-resmanagement'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-resmanagement-settings'
index 1a665e6..29ee2a0 100644 (file)
@@ -19,7 +19,6 @@
           script:
             !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
     mvn-settings: 'vfc-nfvo-wfengine-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vfc-nfvo-wfengine-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vfc/nfvo/wfengine
+    project-name: 'vfc-nfvo-wfengine'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-wfengine-settings'
index 7f4cb3b..7c4d5fc 100644 (file)
@@ -3,7 +3,6 @@
     name: vid
     project-name: 'vid'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
@@ -12,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
@@ -28,6 +29,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
     mvn-settings: 'vid-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vid-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vid
+    project-name: 'vid'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vid-settings'
index a169794..e64ff60 100644 (file)
@@ -17,7 +17,6 @@
     mvn-settings: 'vnfsdk-dovetail-integration-settings'
     build-node: ubuntu1604-builder-4c-4g
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{subproject}-python-staging-{stream}'
     project: 'vnfsdk/dovetail-integration'
     project-name: 'vnfsdk-dovetail-integration'
     branch: 'master'
+
+- project:
+    name: vnfsdk-dovetail-integration-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vnfsdk/dovetail-integration
+    project-name: 'vnfsdk-dovetail-integration'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vnfsdk-dovetail-integration-settings'
index d83b42d..74416e8 100644 (file)
@@ -3,7 +3,6 @@
     name: vnfsdk-functest
     project-name: 'vnfsdk-functest'
     jobs:
-    - gerrit-maven-clm
     - '{project-name}-{stream}-verify-java'
     - '{project-name}-{stream}-merge-java'
     - '{project-name}-{stream}-release-version-java-daily'
     project: 'vnfsdk/functest'
     project-name: 'vnfsdk-functest'
     branch: 'master'
+
+- project:
+    name: vnfsdk-functest-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vnfsdk/functest
+    project-name: 'vnfsdk-functest'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vnfsdk-functest-settings'
index 0b06405..16ebadc 100644 (file)
@@ -24,7 +24,6 @@
     mvn-settings: 'vnfsdk-ice-settings'
     build-node: ubuntu1604-builder-4c-4g
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{subproject}-python-staging-{stream}'
     mvn-settings: 'vnfsdk-ice-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vnfsdk-ice-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vnfsdk/ice
+    project-name: 'vnfsdk-ice'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vnfsdk-ice-settings'
index e30be04..ceb5e2a 100644 (file)
@@ -3,7 +3,6 @@
     name: vnfsdk-refrepo
     project-name: 'vnfsdk-refrepo'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'vnfsdk/refrepo'
     project-name: 'vnfsdk-refrepo'
     branch: 'master'
+
+- project:
+    name: vnfsdk-refrepo-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vnfsdk/refrepo
+    project-name: 'vnfsdk-refrepo'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vnfsdk-refrepo-settings'
index 2a4a039..377c2d5 100644 (file)
@@ -3,7 +3,6 @@
     name: vnfsdk-validation
     project-name: 'vnfsdk-validation'
     jobs:
-    - gerrit-maven-clm
     - '{project-name}-{stream}-verify-java'
     - '{project-name}-{stream}-merge-java'
     - '{project-name}-{stream}-release-version-java-daily'
     project: 'vnfsdk/validation'
     project-name: 'vnfsdk-validation'
     branch: 'master'
+
+- project:
+    name: vnfsdk-validation-clm
+    jobs:
+      - gerrit-maven-clm
+    project: vnfsdk/validation
+    project-name: 'vnfsdk-validation'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vnfsdk-validation-settings'
index ee9ec08..d4f2895 100644 (file)
@@ -7,8 +7,6 @@
           pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
           pattern: 'veslibrary/**'
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
       - '{project-name}-{stream}-verify-java':
           mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
     project: 'vnfsdk/ves-agent'
     project-name: 'vnfsdk-ves-agent'
     branch: 'master'
+
+- project:
+    name: vnfsdk-ves-agent-clm
+    jobs:
+      - gerrit-maven-clm:
+         mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
+    project: vnfsdk/ves-agent
+    project-name: 'vnfsdk-ves-agent'
+    build-node: ubuntu1604-builder-4c-4g
+    branch: 'master'
+    mvn-settings: 'vnfsdk-ves-agent-settings'
index 0029afe..6961de6 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 0029afef91fd71afbd62ad41d09a3c4b05cceaa8
+Subproject commit 6961de60eb1b20375b7b6839f05bff9deed6f621