Merge "Remove jjb for repos for amsterdam release"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Sat, 10 Feb 2018 00:26:04 +0000 (00:26 +0000)
committerGerrit Code Review <gerrit@onap.org>
Sat, 10 Feb 2018 00:26:04 +0000 (00:26 +0000)
158 files changed:
jjb/aaf/aaf-authz.yaml
jjb/aaf/aaf-cadi.yaml
jjb/aaf/aaf-inno.yaml
jjb/aai/aai-aai-common.yaml
jjb/aai/aai-aai-service.yaml
jjb/aai/aai-babel.yaml
jjb/aai/aai-champ.yaml
jjb/aai/aai-csit.yaml
jjb/aai/aai-data-router.yaml
jjb/aai/aai-esr-gui.yaml
jjb/aai/aai-esr-server.yaml
jjb/aai/aai-event-client.yaml [new file with mode: 0644]
jjb/aai/aai-logging-service.yaml
jjb/aai/aai-model-loader.yaml
jjb/aai/aai-resources.yaml
jjb/aai/aai-rest-client.yaml
jjb/aai/aai-router-core-service.yaml
jjb/aai/aai-search-data-service.yaml
jjb/aai/aai-sparky-be.yaml
jjb/aai/aai-sparky-fe.yaml
jjb/aai/aai-traversal.yaml
jjb/appc/appc-csit.yaml
jjb/appc/appc-deployment.yaml
jjb/appc/appc-master.yaml
jjb/appc/appc-release.yaml [new file with mode: 0644]
jjb/ccsdk/dashboard.yaml
jjb/ccsdk/distribution.yaml
jjb/ccsdk/parent.yaml
jjb/ccsdk/platform-nbapi.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/storage-pgaas.yaml
jjb/ccsdk/utils.yaml
jjb/ci-management/ci-management.yaml
jjb/clamp/clamp.yaml
jjb/cli/cli.yaml
jjb/dcaegen2/apod-analytics.yaml
jjb/dcaegen2/dcaegen2-analytics.yaml
jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
jjb/dcaegen2/dcaegen2-collectors-ves.yaml
jjb/dcaegen2/dcaegen2-collectors.yaml
jjb/dcaegen2/dcaegen2-csit.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-platform.yaml
jjb/dcaegen2/dcaegen2-utils.yaml
jjb/dcaegen2/dcaegen2.yaml
jjb/demo/demo.yaml
jjb/dmaap/dmaap-buscontroller.yaml [new file with mode: 0644]
jjb/dmaap/dmaap-dbcapi.yaml [new file with mode: 0644]
jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
jjb/dmaap/dmaap-messagerouter-messageservice.yaml
jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
jjb/global-jjb
jjb/global-templates-java.yaml
jjb/global-templates-python.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-bootstrap.yaml [new file with mode: 0644]
jjb/integration/integration-csit.yaml
jjb/integration/integration-docker.yaml
jjb/integration/integration-templates-csit.yaml
jjb/integration/integration.yaml
jjb/lab/include-raw-lab-retrieve-logs.sh [new file with mode: 0644]
jjb/lab/lab-templates.yaml [new file with mode: 0644]
jjb/lab/lab.yaml [new file with mode: 0644]
jjb/logging-analytics/logging-analytics.yaml [new file with mode: 0644]
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/multicloud-framework-java.yaml
jjb/multicloud/multicloud-framework-python.yaml
jjb/multicloud/multicloud-openstack-vmware-java.yaml
jjb/multicloud/multicloud-openstack-vmware-python.yaml
jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml
jjb/multicloud/multicloud-openstack.yaml
jjb/music/music.yaml [new file with mode: 0644]
jjb/oom/oom-registrator.yaml
jjb/oparent/oparent.yaml
jjb/optf/optf-has-python.yaml [new file with mode: 0644]
jjb/optf/optf-osdf-python.yaml [new file with mode: 0644]
jjb/policy/policy-api.yaml
jjb/policy/policy-common.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-pap.yaml
jjb/policy/policy-pdp.yaml
jjb/portal-sdk/portal-sdk.yaml
jjb/portal/portal.yaml
jjb/sdc/sdc-csit.yaml
jjb/sdc/sdc-jtosca.yaml
jjb/sdc/sdc-sdc-distribution-client.yaml
jjb/sdc/sdc-sdc-docker-base.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-adaptors.yaml
jjb/sdnc/sdnc-core.yaml
jjb/sdnc/sdnc-northbound.yaml
jjb/sdnc/sdnc-oam.yaml
jjb/sdnc/sdnc-plugins.yaml
jjb/so/so-libs.yaml
jjb/so/so.yaml
jjb/testsuite/testsuite-heatbridge-master.yaml
jjb/testsuite/testsuite-python-testing-utils.yaml
jjb/testsuite/testsuite.yaml
jjb/ui/ui-dmaapbc.yaml
jjb/usecaseui/usecase-ui-server.yaml
jjb/usecaseui/usecase-ui.yaml
jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
jjb/vfc/vfc-gvnfm-vnfres-java.yaml
jjb/vfc/vfc-gvnfm-vnfres-python.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-gvnfm-juju.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
jjb/vfc/vfc-nfvo-lcm-java.yaml
jjb/vfc/vfc-nfvo-lcm-python.yaml
jjb/vfc/vfc-nfvo-resmanagement.yaml
jjb/vfc/vfc-nfvo-wfengine-java.yaml
jjb/vid/vid-asdcclient.yaml
jjb/vid/vid.yaml
jjb/vnfsdk/vnfsdk-compliance.yaml
jjb/vnfsdk/vnfsdk-refrepo.yaml
jjb/vnfsdk/vnfsdk-validation.yaml
jjb/vvp/vvp-jenkins.yaml

index 89eb428..5e7ae88 100644 (file)
     mvn-profile: docker
     docker-pom: 'authz-service/pom.xml'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: aaf-authz-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aaf/authz'
+    project-name: 'aaf-authz'
+    branch: 'master'
+    mvn-settings: 'aaf-authz-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index d803759..34c2b43 100644 (file)
           branch: 'master'
     mvn-settings: 'aaf-cadi-settings'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: aaf-cadi-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aaf/cadi'
+    project-name: 'aaf-cadi'
+    branch: 'master'
+    mvn-settings: 'aaf-cadi-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 22d8a22..7bd5efc 100644 (file)
           branch: 'master'
     mvn-settings: 'aaf-inno-settings'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: aaf-inno-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aaf/inno'
+    project-name: 'aaf-inno'
+    branch: 'master'
+    mvn-settings: 'aaf-inno-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 403ddd0..4c836f9 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: aai-aai-common
+    name: aai-aai-common-master
     project-name: 'aai-aai-common'
     jobs:
       - gerrit-maven-clm:
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-aai-common-releases
+    project-name: 'aai-aai-common'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'aai/aai-common'
+    stream:
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'aai-aai-common-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-aai-common-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/aai-common'
+    project-name: 'aai-aai-common'
+    branch: 'master'
+    mvn-settings: 'aai-aai-common-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 48514f6..d636403 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-aai-service-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/aai-service'
+    project-name: 'aai-aai-service'
+    branch: 'master'
+    mvn-settings: 'aai-aai-service-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 30162c7..3a24fe4 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-babel-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/babel'
+    project-name: 'aai-babel'
+    branch: 'master'
+    mvn-settings: 'aai-babel-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index ce85970..6f0dffb 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-champ-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/champ'
+    project-name: 'aai-champ'
+    branch: 'master'
+    mvn-settings: 'aai-champ-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 303aa5f..6b7ee8a 100644 (file)
@@ -5,7 +5,11 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'aai'
-    stream: 'master'
+    stream:
+      - 'master':
+          branch: master
+      - 'amsterdam':
+          branch: amsterdam
     functionality:
       - 'resources':
           trigger_jobs:
@@ -17,4 +21,4 @@
           trigger_jobs:
             - 'aai-esr-server-{stream}-docker-java-daily'
     robot-options: ''
-    branch: 'master'
+
index a3c15ee..9cafe0b 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: aai-data-router
+    name: aai-data-router-master
     project-name: 'aai-data-router'
     jobs:
       - gerrit-maven-clm:
           branch: 'master'
     mvn-settings: 'aai-data-router-settings'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: aai-data-router-releases
+    project-name: 'aai-data-router'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'pom.xml'
+          mvn-goals: 'docker:build'
+    project: 'aai/data-router'
+    stream:
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'aai-data-router-settings'
+    files: '**'
+    archive-artifacts: ''
+- project:
+    name: aai-data-router-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/data-router'
+    project-name: 'aai-data-router'
+    branch: 'master'
+    mvn-settings: 'aai-data-router-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index e2efa91..3ed17b8 100644 (file)
@@ -7,16 +7,30 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily'
 
     project: 'aai/esr-gui'
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'aai-esr-gui-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-esr-gui-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/esr-gui'
+    project-name: 'aai-esr-gui'
+    branch: 'master'
+    mvn-settings: 'aai-esr-gui-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 2f7076b..c39514e 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: aai-esr-server
+    name: aai-esr-server-master
     project-name: 'aai-esr-server'
     jobs:
       - gerrit-maven-clm:
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-esr-server-releases
+    project-name: 'aai-esr-server'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-daily'
+
+    project: 'aai/esr-server'
+    stream:
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'aai-esr-server-settings'
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: docker
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-esr-server-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/esr-server'
+    project-name: 'aai-esr-server'
+    branch: 'master'
+    mvn-settings: 'aai-esr-server-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
new file mode 100644 (file)
index 0000000..92110f0
--- /dev/null
@@ -0,0 +1,17 @@
+---
+- project:
+    name: aai-event-client-master
+    project-name: 'aai-event-client'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+    project: 'aai/event-client'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-event-client-settings'
+    files: '**'
+    archive-artifacts: ''
\ No newline at end of file
index 8aa510a..8d6ff0f 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: aai-logging-service
+    name: aai-logging-service-master
     project-name: 'aai-logging-service'
     jobs:
       - gerrit-maven-clm:
     stream:
       - 'master':
           branch: 'master'
+    mvn-settings: 'aai-logging-service-settings'
+    files: '**'
+    archive-artifacts: ''
+- project:
+    name: aai-logging-service-releases
+    project-name: 'aai-logging-service'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+    project: 'aai/logging-service'
+    stream:
       - 'release-1.0.0':
           branch: 'release-1.0.0'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'aai-logging-service-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: aai-logging-service-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/logging-service'
+    project-name: 'aai-logging-service'
+    branch: 'master'
+    mvn-settings: 'aai-logging-service-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index ac761c5..eafe250 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: aai-model-loader
+    name: aai-model-loader-master
     project-name: 'aai-model-loader'
     jobs:
       - gerrit-maven-clm:
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-model-loader-releases
+    project-name: 'aai-model-loader'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'pom.xml'
+          mvn-goals: 'docker:build'
+    project: 'aai/model-loader'
+    stream:
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'aai-model-loader-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-model-loader-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/model-loader'
+    project-name: 'aai-model-loader'
+    branch: 'master'
+    mvn-settings: 'aai-model-loader-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 0f466e6..19c5e3f 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-resources-amsterdam
+    project-name: 'aai-resources'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-aai-docker-java-version-daily':
+          pom: 'aai-resources/pom.xml'
+          mvn-goals: 'docker:build docker:push'
+
+    project: 'aai/resources'
+    stream:
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'aai-resources-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-resources-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/resources'
+    project-name: 'aai-resources'
+    branch: 'master'
+    mvn-settings: 'aai-resources-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 51374a2..37c2084 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: aai-rest-client
+    name: aai-rest-client-master
     project-name: 'aai-rest-client'
     jobs:
       - gerrit-maven-clm:
     mvn-settings: 'aai-rest-client-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: aai-rest-client-releases
+    project-name: 'aai-rest-client'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+    project: 'aai/rest-client'
+    stream:
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'aai-rest-client-settings'
+    files: '**'
+    archive-artifacts: ''
+- project:
+    name: aai-rest-client-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/rest-client'
+    project-name: 'aai-rest-client'
+    branch: 'master'
+    mvn-settings: 'aai-rest-client-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 1732319..73a6d3a 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: aai-router-core
+    name: aai-router-core-master
     project-name: 'aai-router-core'
     jobs:
       - gerrit-maven-clm:
     mvn-settings: 'aai-router-core-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: aai-router-core-releases
+    project-name: 'aai-router-core'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+    project: 'aai/router-core'
+    stream:
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'aai-router-core-settings'
+    files: '**'
+    archive-artifacts: ''
+- project:
+    name: aai-router-core-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/router-core'
+    project-name: 'aai-router-core'
+    branch: 'master'
+    mvn-settings: 'aai-router-core-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index de9af76..b9cceb8 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: aai-search-data-service
+    name: aai-search-data-service-master
     project-name: 'aai-search-data-service'
     jobs:
       - gerrit-maven-clm:
           branch: 'master'
     mvn-settings: 'aai-search-data-service-settings'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: aai-search-data-service-releases
+    project-name: 'aai-search-data-service'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'pom.xml'
+          mvn-goals: 'docker:build'
+    project: 'aai/search-data-service'
+    stream:
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'aai-search-data-service-settings'
+    files: '**'
+    archive-artifacts: ''
index 8f49eb3..87724f4 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: aai-sparky-be
+    name: aai-sparky-be-master
     project-name: 'aai-sparky-be'
     jobs:
       - gerrit-maven-clm:
           branch: 'master'
     mvn-settings: 'aai-sparky-be-settings'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: aai-sparky-be-releases
+    project-name: 'aai-sparky-be'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'pom.xml'
+          mvn-goals: 'docker:build'
+    project: 'aai/sparky-be'
+    stream:
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'aai-sparky-be-settings'
+    files: '**'
+    archive-artifacts: ''
+- project:
+    name: aai-sparky-be-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/sparky-be'
+    project-name: 'aai-sparky-be'
+    branch: 'master'
+    mvn-settings: 'aai-sparky-be-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index fd1b330..5c20d25 100644 (file)
@@ -8,11 +8,25 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
     project: 'aai/sparky-fe'
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'aai-sparky-fe-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: aai-sparky-fe-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/sparky-fe'
+    project-name: 'aai-sparky-fe'
+    branch: 'master'
+    mvn-settings: 'aai-sparky-fe-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 3803ca3..892cba1 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: aai-traversal
+    name: aai-traversal-master
     project-name: 'aai-traversal'
     jobs:
       - gerrit-maven-clm:
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-traversal-amsterdam
+    project-name: 'aai-traversal'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-aai-docker-java-version-daily':
+          pom: 'aai-traversal/pom.xml'
+          mvn-goals: 'docker:build docker:push'
+
+    project: 'aai/traversal'
+    stream:
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'aai-traversal-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-traversal-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'aai/traversal'
+    project-name: 'aai-traversal'
+    branch: 'master'
+    mvn-settings: 'aai-traversal-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 1a364df..e257a8b 100644 (file)
@@ -5,10 +5,13 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'appc'
-    stream: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     functionality:
       - 'healthcheck':
           trigger_jobs:
             - '{project-name}-{stream}-release-java-daily-checkstyle'
     robot-options: ''
-    branch: 'master'
index 782e6e2..3f4c91e 100644 (file)
@@ -8,7 +8,7 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily'
       - '{project-name}-{stream}-docker-version-java-daily'
       - '{project-name}-docker-image-blessing'
index 82615fe..2b14835 100644 (file)
@@ -6,17 +6,31 @@
       - gerrit-maven-clm:
           java-version: ''
           mvn-params: '-DskipTests'
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+          build-timeout: 30
+          build-node: ubuntu1604-basebuild-8c-8g
+      - '{project-name}-{stream}-verify-java':
+          build-node: ubuntu1604-basebuild-8c-8g
+      - '{project-name}-{stream}-merge-java':
+          build-node: ubuntu1604-basebuild-8c-8g
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'appc'
     stream:
       - 'master':
           branch: 'master'
-      - 'amsterdam':
-          branch: 'amsterdam'
     mvn-settings: 'appc-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: appc-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-8c-8g
+    java-version: ''
+    project: 'appc'
+    project-name: 'appc'
+    branch: 'master'
+    mvn-settings: 'appc-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/appc/appc-release.yaml b/jjb/appc/appc-release.yaml
new file mode 100644 (file)
index 0000000..b65b3d8
--- /dev/null
@@ -0,0 +1,21 @@
+---
+- project:
+    name: appc-release
+    project-name: 'appc'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+          mvn-params: '-DskipTests'
+          build-timeout: 30
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'appc'
+    stream:
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'appc-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
index 05a134d..08ec0f2 100644 (file)
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: ccsdk-dashboard-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'ccsdk/dashboard'
+    project-name: 'ccsdk-dashboard'
+    branch: 'master'
+    mvn-settings: 'ccsdk-dashboard-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 6cc35c8..fe4a840 100644 (file)
@@ -7,7 +7,7 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily'
       - '{project-name}-{stream}-docker-version-java-daily'
 
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-docker-8c-8g
+- project:
+    name: ccsdk-distribution-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'ccsdk/distribution'
+    project-name: 'ccsdk-distribution'
+    branch: 'master'
+    mvn-settings: 'ccsdk-distribution-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index ac8024c..1f76950 100644 (file)
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: ccsdk-parent-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'ccsdk/parent'
+    project-name: 'ccsdk-parent'
+    branch: 'master'
+    mvn-settings: 'ccsdk-parent-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index cbd51dd..405daa6 100644 (file)
@@ -7,7 +7,7 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/platform/nbapi'
     stream:
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: ccsdk-platform-nbapi-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'ccsdk/platform/nbapi'
+    project-name: 'ccsdk-platform-nbapi'
+    branch: 'master'
+    mvn-settings: 'ccsdk-platform-nbapi-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 1fc194a..8463409 100644 (file)
@@ -7,7 +7,7 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/platform/plugins'
     stream:
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: ccsdk-platform-plugins-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'ccsdk/platform/plugins'
+    project-name: 'ccsdk-platform-plugins'
+    branch: 'master'
+    mvn-settings: 'ccsdk-platform-plugins-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 7ef3925..88f69e7 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: ccsdk-sli-adaptors-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'ccsdk/sli/adaptors'
+    project-name: 'ccsdk-sli-adaptors'
+    branch: 'master'
+    mvn-settings: 'ccsdk-sli-adaptors-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 45ec039..1de8575 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: ccsdk-sli-core-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'ccsdk/sli/core'
+    project-name: 'ccsdk-sli-core'
+    branch: 'master'
+    mvn-settings: 'ccsdk-sli-core-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index aacb71c..deb1246 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: ccsdk-sli-northbound-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'ccsdk/sli/northbound'
+    project-name: 'ccsdk-sli-northbound'
+    branch: 'master'
+    mvn-settings: 'ccsdk-sli-northbound-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index e24c1ca..8a81e34 100644 (file)
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: ccsdk-sli-plugins-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'ccsdk/sli/plugins'
+    project-name: 'ccsdk-sli-plugins'
+    branch: 'master'
+    mvn-settings: 'ccsdk-sli-plugins-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 7961633..a5c06f1 100644 (file)
@@ -7,7 +7,7 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/storage/pgaas'
     stream:
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: ccsdk-storage-pgaas-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'ccsdk/storage/pgaas'
+    project-name: 'ccsdk-storage-pgaas'
+    branch: 'master'
+    mvn-settings: 'ccsdk-storage-pgaas-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index b0d53ba..f8203ac 100644 (file)
@@ -7,7 +7,7 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/utils'
     stream:
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: ccsdk-utils-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'ccsdk/utils'
+    project-name: 'ccsdk-utils'
+    branch: 'master'
+    mvn-settings: 'ccsdk-utils-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index c1dea93..56a6c58 100644 (file)
@@ -10,6 +10,7 @@
     branch: 'master'
     build-timeout: '60'
     build-node: 'centos7-basebuild-2c-1g'
+    jjb-version: 2.0.0
 
 - project:
     name: packer-jobs
index 746caa0..d648d4f 100644 (file)
@@ -4,6 +4,8 @@
     name: clamp
     project-name: 'clamp'
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{project-name}-{stream}-verify-java-checkstyle'
       - '{project-name}-{stream}-merge-properties-java':
          mvn_properties:
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'clamp-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
+- project:
+    name: clamp-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'clamp'
+    project-name: 'clamp'
+    branch: 'master'
+    mvn-settings: 'clamp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 723e969..48f220b 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.1.0':
-          branch: 'release-1.1.0'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'cli-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: cli-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'cli'
+    project-name: 'cli'
+    branch: 'master'
+    mvn-settings: 'cli-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 4e6f2f3..8605cf1 100644 (file)
@@ -1,27 +1,39 @@
----\r
-- project:\r
-    name: dcaegen2-analytics-tca\r
-\r
-    # job template iterators\r
-    project-name: 'dcaegen2-analytics-tca'\r
-    stream:\r
-      - 'master':\r
-          branch: 'master'\r
-      - 'amsterdam':\r
-          branch: 'amsterdam'\r
-\r
-    # apply to all jobs\r
-    project: 'dcaegen2/analytics/tca'\r
-    mvn-settings: 'dcaegen2-analytics-tca-settings'\r
-    files: '**'\r
-    maven-deploy-properties: |\r
-      deployAtEnd=true\r
-    archive-artifacts: ''\r
-    build-node: ubuntu1604-basebuild-4c-4g\r
-\r
-    jobs:\r
-      - '{project-name}-{stream}-release-version-java-daily'\r
-      - '{project-name}-{stream}-verify-java-skip-tests':\r
-          mvn-goals: 'clean install'\r
-      - '{project-name}-{stream}-merge-java':\r
-          mvn-goals: 'clean deploy'\r
+---
+- project:
+    name: dcaegen2-analytics-tca
+
+    # job template iterators
+    project-name: 'dcaegen2-analytics-tca'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
+
+    # apply to all jobs
+    project: 'dcaegen2/analytics/tca'
+    mvn-settings: 'dcaegen2-analytics-tca-settings'
+    files: '**'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
+
+    jobs:
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-verify-java-skip-tests':
+          mvn-goals: 'clean install'
+      - '{project-name}-{stream}-merge-java':
+          mvn-goals: 'clean deploy'
+- project:
+    name: dcaegen2-analytics-tca-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/analytics/tca'
+    project-name: 'dcaegen2-analytics-tca'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-analytics-tca-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 27feb20..0f68fcf 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'dcaegen2/analytics'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-analytics-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/analytics'
+    project-name: 'dcaegen2-analytics'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-analytics-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 1990c0c..35a5ec7 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'dcaegen2/collectors/snmptrap'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-collectors-snmptrap-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/collectors/snmptrap'
+    project-name: 'dcaegen2-collectors-snmptrap'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 4f03d99..394bf99 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-collectors-ves-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/collectors/ves'
+    project-name: 'dcaegen2-collectors-ves'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-collectors-ves-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 87e4fd4..d802d2b 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'dcaegen2/collectors'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-collectors-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/collectors'
+    project-name: 'dcaegen2-collectors'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-collectors-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index f4e5d00..cf22f35 100644 (file)
@@ -4,11 +4,14 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dcaegen2'
-    stream: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     functionality:
       - 'testsuites':
           trigger_jobs:
             - 'dcaegen2-master-merge-java'
             - 'dcaegen2-collectors-ves-master-merge-java'
     robot-options: ''
-    branch: 'master'
index deaab94..0e41387 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'dcaegen2/deployments'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-deployments-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/deployments'
+    project-name: 'dcaegen2-deployments'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-deployments-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index ab047d5..296c49a 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'dcaegen2/platform/blueprints'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-blueprints-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/platform/blueprints'
+    project-name: 'dcaegen2-platform-blueprints'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-blueprints-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index ce4f848..70cd7a9 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'dcaegen2/platform/cdapbroker'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-cdapbroker-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/platform/cdapbroker'
+    project-name: 'dcaegen2-platform-cdapbroker'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-cdapbroker-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 043f40f..00cfddd 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'dcaegen2/platform/cli'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-cli-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/platform/cli'
+    project-name: 'dcaegen2-platform-cli'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-cli-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 6109812..f9c9a71 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'dcaegen2/platform/configbinding'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-configbinding-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/platform/configbinding'
+    project-name: 'dcaegen2-platform-configbinding'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-configbinding-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 3c21e9b..13db895 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'dcaegen2/platform/deployment-handler'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-deployment-handler-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/platform/deployment-handler'
+    project-name: 'dcaegen2-platform-deployment-handler'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 543c627..14298f7 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-inventory-api-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/platform/inventory-api'
+    project-name: 'dcaegen2-platform-inventory-api'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-inventory-api-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 5607138..96287ad 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'dcaegen2/platform/plugins'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-plugins-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/platform/plugins'
+    project-name: 'dcaegen2-platform-plugins'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-plugins-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index ccff1c5..35a1351 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'dcaegen2/platform/policy-handler'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-policy-handler-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/platform/policy-handler'
+    project-name: 'dcaegen2-platform-policy-handler'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-policy-handler-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index e2821a9..faa561c 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-shell-daily':
           mvn-goals: 'clean package docker:build -DpushImage'
           # No-op
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-servicechange-handler-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/platform/servicechange-handler'
+    project-name: 'dcaegen2-platform-servicechange-handler'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index d1ce4a8..3142196 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'dcaegen2/platform'
     stream:
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: dcaegen2-platform-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 3f4f161..2f0fe32 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'dcaegen2/utils'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-utils-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2/utils'
+    project-name: 'dcaegen2-utils'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-utils-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index b07b848..67f8929 100644 (file)
@@ -3,9 +3,11 @@
     name: dcaegen2
     project-name: 'dcaegen2'
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'dcaegen2'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dcaegen2'
+    project-name: 'dcaegen2'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 226d861..ccfb7ae 100644 (file)
@@ -8,14 +8,28 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'demo'
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
       - 'release-1.0.0':
           branch: 'release-1.0.0'
     mvn-settings: 'demo-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: demo-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'demo'
+    project-name: 'demo'
+    branch: 'master'
+    mvn-settings: 'demo-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
new file mode 100644 (file)
index 0000000..08a55e0
--- /dev/null
@@ -0,0 +1,33 @@
+---
+- project:
+    name: dmaap-buscontroller
+    project-name: 'dmaap-buscontroller'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+          mvn-goals: 'clean install'
+    project: 'dmaap/buscontroller'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dmaap-buscontroller-settings'
+    files: '**'
+    archive-artifacts: ''
+- project:
+    name: dmaap-buscontroller-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dmaap/buscontroller'
+    project-name: 'dmaap-buscontroller'
+    branch: 'master'
+    mvn-settings: 'dmaap-buscontroller-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
new file mode 100644 (file)
index 0000000..0f644c6
--- /dev/null
@@ -0,0 +1,33 @@
+---
+- project:
+    name: dmaap-dbcapi
+    project-name: 'dmaap-dbcapi'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+          mvn-goals: 'clean install'
+    project: 'dmaap/dbcapi'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dmaap-dbcapi-settings'
+    files: '**'
+    archive-artifacts: ''
+- project:
+    name: dmaap-dbcapi-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dmaap/dbcapi'
+    project-name: 'dmaap-dbcapi'
+    branch: 'master'
+    mvn-settings: 'dmaap-dbcapi-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 4a08f7f..e4e8b53 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: dmaap-messagerouter-dmaapclient-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dmaap/messagerouter/dmaapclient'
+    project-name: 'dmaap-messagerouter-dmaapclient'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index f275a4f..bae8d0a 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: dmaap-messagerouter-messageservice-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dmaap/messagerouter/messageservice'
+    project-name: 'dmaap-messagerouter-messageservice'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 10d6169..6b08533 100644 (file)
@@ -1,21 +1,35 @@
----\r
-- project:\r
-    name: dmaap-messagerouter-mirroragent\r
-    project-name: 'dmaap-messagerouter-mirroragent'\r
-    jobs:\r
+---
+- project:
+    name: dmaap-messagerouter-mirroragent
+    project-name: 'dmaap-messagerouter-mirroragent'
+    jobs:
       - gerrit-maven-clm:
           java-version: ''
-      - '{project-name}-{stream}-verify-java'\r
-      - '{project-name}-{stream}-merge-java'\r
-      - '{project-name}-{stream}-release-version-java-daily'\r
-      - '{project-name}-{stream}-stage-site-java':\r
-          site-pom: 'pom.xml'\r
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'\r
-          mvn-goals: 'clean install'\r
-    project: 'dmaap/messagerouter/mirroragent'\r
-    stream:\r
-      - 'master':\r
-          branch: 'master'\r
-    mvn-settings: 'dmaap-messagerouter-mirroragent-settings'\r
-    files: '**'\r
-    archive-artifacts: ''
\ No newline at end of file
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+          mvn-goals: 'clean install'
+    project: 'dmaap/messagerouter/mirroragent'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
+    files: '**'
+    archive-artifacts: ''
+- project:
+    name: dmaap-messagerouter-mirroragent-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dmaap/messagerouter/mirroragent'
+    project-name: 'dmaap-messagerouter-mirroragent'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index a7b0b80..963ee05 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: dmaap-messagerouter-msgrtr-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'dmaap/messagerouter/msgrtr'
+    project-name: 'dmaap-messagerouter-msgrtr'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 98512a2..779110b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 98512a2a3e4aacecc5834f4d3b51d8c5333045ff
+Subproject commit 779110b5cd63f3eabb63598a1be79d9b9ba85464
index c8d5665..0c82e70 100644 (file)
@@ -2,8 +2,8 @@
 - job-template:
     # Job template for Java verify jobs
     #
-    # The purpose of this job template is to run "maven clean install" for
-    # projects using this template.
+    # The purpose of this job template is to run:
+    # 1. maven clean install -DskipTests=true
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
@@ -66,8 +66,8 @@
 - job-template:
     # Job template for Java verify jobs
     #
-    # The purpose of this job template is to run "maven clean install" for
-    # projects using this template.
+    # The purpose of this job template is to run:
+    # 1. maven clean install
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
     # Job template for Java verify jobs running checkstyle at the end
     # When checkstyle will be fully incorporated, it is meant to replace
     #  '{project-name}-{stream}-verify-java-checkstyle'
-    # The purpose of this job template is to run "maven clean install" for
-    # projects using this template.
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean install
+    #
+    # This job publishes checkstyle results.
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
+
     name: '{project-name}-{stream}-verify-java-checkstyle'
     project-type: freestyle
     concurrent: true
 - job-template:
     # Job template for Java verify jobs that takes a maven template
     #
-    # The purpose of this job template is to run "maven clean install -P {x}"
-    # for projects using this template.
+    # The purpose of this job template is to run:
+    # 1. maven clean install -P {mvn-profile}
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
 - job-template:
     # Job template for Java verify jobs with POM not at the root
     #
-    # The purpose of this job template is to run "maven clean install" for
-    # projects using this template.
+    # The purpose of this job template is to run:
+    # 1. maven clean install
+    #
+    # This job supports subprojects.
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
 - job-template:
     # Job template for Java daily release jobs
     #
-    # The purpose of this job template is to run "maven version && maven clean
-    # deploy" for projects using this template.
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy with Sonar scans
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
-    name: '{project-name}-{stream}-release-java-daily'
-
-    project-type: freestyle
-    node: '{build-node}'
-    maven-deploy-properties:
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 11 AM UTC
-      - timed: 'H 11 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          properties:
-            - '{maven-deploy-properties}'
-          java-opts:
-            - '-Xmx4096m -XX:MaxPermSize=512m'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
 
-- job-template:
-    # Job template for Java daily release jobs
-    #
-    # The purpose of this job template is to run "maven version && maven clean
-    # deploy" for projects using this template.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    name: '{project-name}-{stream}-release-java-daily-no-sonar'
+    name: '{project-name}-{stream}-release-java-daily'
 
     project-type: freestyle
     node: '{build-node}'
     # Job template for Java daily release jobs running checkstyle at the end
     # When checkstyle will be fully incorporated, it is meant to replace
     #  '{project-name}-{stream}-release-java-daily'
-    # The purpose of this job template is to run "maven version && maven clean
-    # deploy" for projects using this template.
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy with Sonar scans
+    #
+    # This job publishes checkstyle results.
+    # This job uses a conditional regex match step to set versions.
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
+
     name: '{project-name}-{stream}-release-java-daily-checkstyle'
     project-type: freestyle
     node: '{build-node}'
                 global-settings-type: cfp
       - maven-target:
           maven-version: '{maven-version}'
-          goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties: '{obj:mvn_properties}'
           settings: '{mvn-settings}'
 - job-template:
     # Job template for Java daily release jobs
     #
-    # The purpose of this job template is to run "maven version && maven clean
-    # deploy" for projects using this template.
+    # The purpose of this job template is to run:
+    # 1. maven set versions
+    # 2. maven clean deploy with Sonar scans
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
-    name: '{project-name}-{stream}-release-version-java-daily-no-sonar'
-
-    project-type: freestyle
-    node: '{build-node}'
-    maven-deploy-properties:
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 11 AM UTC
-      - timed: 'H H(10-17) * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
 
-      - inject:
-          properties-file: version.properties
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'versions:set versions:update-child-modules versions:commit -B'
-          properties:
-            - 'newVersion=${{release_version}}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          properties:
-            - '{maven-deploy-properties}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for Java daily release jobs
-    #
-    # The purpose of this job template is to run "maven version && maven clean
-    # deploy" for projects using this template.
-    # This template supports subprojects.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    name: '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
+    name: '{project-name}-{stream}-release-version-java-daily'
 
     project-type: freestyle
     node: '{build-node}'
           properties-file: version.properties
       - maven-target:
           maven-version: '{maven-version}'
-          pom: '{pom}'
           goals: 'versions:set versions:update-child-modules versions:commit -B'
           properties:
             - 'newVersion=${{release_version}}'
 
       - maven-target:
           maven-version: '{maven-version}'
-          pom: '{pom}'
           goals: 'clean deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
 - job-template:
     # Job template for Java daily release jobs
     #
-    # The purpose of this job template is to run "maven version && maven clean
-    # deploy" for projects using this template.
+    # The purpose of this job template is to run:
+    # 1. maven set versions
+    # 2. maven clean deploy -P {mvn-profile} with Sonar scans
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
-    name: '{project-name}-{stream}-release-version-java-daily'
-
-    project-type: freestyle
-    node: '{build-node}'
-    maven-deploy-properties:
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 11 AM UTC
-      - timed: 'H H(10-17) * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - inject:
-          properties-file: version.properties
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'versions:set versions:update-child-modules versions:commit -B'
-          properties:
-            - 'newVersion=${{release_version}}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          properties:
-            - '{maven-deploy-properties}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
 
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for Java daily release jobs
-    #
-    # The purpose of this job template is to run "maven version && maven clean
-    # deploy" for projects using this template.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
     name: '{project-name}-{stream}-release-version-profile-java-daily'
 
     project-type: freestyle
 
       - maven-target:
           maven-version: '{maven-version}'
-          goals: 'clean deploy sonar:sonar -P {mvn-profile} -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy -P {mvn-profile} -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
 - job-template:
     # Job template for Java daily release jobs with POM not at the root
     #
-    # The purpose of this job template is to run "maven version && maven clean
-    # deploy" for projects using this template.
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy with Sonar scans
+    #
+    # This job supports subprojects.
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
     #     pom:       name/location of the pom.xml file relative to the workspace
 
-
     name: '{project-name}-{stream}-{subproject}-release-java-daily'
 
     project-type: freestyle
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
 - job-template:
     # Job template for Java daily release jobs with POM not at the root
     #
-    # The purpose of this job template is to run "maven version && maven clean
-    # deploy" for projects using this template.
+    # The purpose of this job template is to run:
+    # 1. maven set versions
+    # 2. maven clean deploy with Sonar scans
+    #
+    # This job supports subprojects.
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
     #     pom:       name/location of the pom.xml file relative to the workspace
 
-
     name: '{project-name}-{stream}-{subproject}-release-version-java-daily'
 
     project-type: freestyle
           global-settings: 'global-settings'
           global-settings-type: cfp
 
-      - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          properties:
-            - '{maven-deploy-properties}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for Java daily release jobs with POM not at the root
-    #
-    # The purpose of this job template is to run "maven version && maven clean
-    # deploy" for projects using this template.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    #     pom:       name/location of the pom.xml file relative to the workspace
-
-
-    name: '{project-name}-{stream}-{subproject}-release-java-daily-no-sonar'
-
-    project-type: freestyle
-    node: '{build-node}'
-    maven-deploy-properties:
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 11 AM UTC
-      - timed: 'H 11 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
-          java-opts:
-            - '-Xmx4096m -XX:MaxPermSize=512m'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
 - job-template:
     # Job template for Java merge jobs
     #
-    # The purpose of this job template is to run "maven clean deploy" for
-    # projects using this template.
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
+
     name: '{project-name}-{stream}-merge-java'
 
     project-type: freestyle
 - job-template:
     # Job template for Java merge jobs based on
     #   '{project-name}-{stream}-merge-java'
-    # The purpose of this job template is to run "maven clean deploy" for
-    # projects using this template.
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy
+    #
+    # This project supports maven properties.
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
     #     maven-properties: properties passed to maven
+
     name: '{project-name}-{stream}-merge-properties-java'
 
     project-type: freestyle
 - job-template:
     # Job template for Java merge jobs that takes a maven template
     #
-    # The purpose of this job template is to run "maven clean deploy -P {x}"
-    # for projects using this template.
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy -P {mvn-profile}
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
+
     name: '{project-name}-{stream}-merge-profile-java'
 
     project-type: freestyle
     #   branch:         git branch
     #   dependencies:   fully qualified upstream job name to trigger on
     #                   this may be ''
+
     name: '{project-name}-{stream}-downstream-merge-java'
 
     project-type: freestyle
 - job-template:
     # Job template for Java merge jobs with POM not at the root
     #
-    # The purpose of this job template is to run "maven clean deploy" for
-    # projects using this template.
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy
+    #
+    # This job supports subprojects.
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
           maven-version: '{maven-version}'
 
 - job-template:
+    # Job template for Docker daily jobs
+    #
+    # The purpose of this job template is to run:
+    # 1. login to the docker registry
+    # 2. docker push
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
     name: '{project-name}-{stream}-docker-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
 - job-template:
     # Job template for building & pushing docker images
     #
-    # The purpose of this job template is to run :
+    # The purpose of this job template is to run:
     #  1. login to the docker registry
-    #  2. do a clean deploy on the specified profile
+    #  2. maven clean deploy on the specified profile
+    #
+    # This job uses a conditional regex match step to set versions.
+    # This template supports maven properties.
     #
     # Required Variables:
     #     pom:       name/location of the pom.xml file relative to the workspace
     #     profile:   the docker profile defined in the pom
     #     maven-properties: properties passed to maven
+
     name: '{project-name}-{stream}-docker-java-properties-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
           maven-version: '{maven-version}'
 
 - job-template:
+    # Job template for building & pushing docker images
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. run a specified shell builder
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     maven-properties: properties passed to maven
+
     name: '{project-name}-{stream}-docker-java-shell-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
           maven-version: '{maven-version}'
 
 - job-template:
+    # Job template for building & pushing docker images
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. inject a version.properties file and set versions
+    #  3. run a specified shell builder
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     maven-properties: properties passed to maven
+
     name: '{project-name}-{stream}-docker-java-version-shell-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
           maven-version: '{maven-version}'
 
 - job-template:
+    # Job template for building & pushing docker images
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. inject a version.properties file and set versions
+    #  3. run a specified shell builder
+    #
+    # This template supports subprojects.
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     maven-properties: properties passed to maven
+
     name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
           maven-version: '{maven-version}'
 
 - job-template:
+    # Job template for building & pushing docker images
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. inject a version.properties file and set versions
+    #  3. run a docker push
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     profile:   the docker profile defined in the pom
+    #     maven-properties: properties passed to maven
+
     name: '{project-name}-{stream}-docker-version-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
           maven-version: '{maven-version}'
 
 - job-template:
+    # Job template for building & pushing docker images
+    #
+    # The purpose of this job template is to run:
+    #  1. inject a version.properties file and set versions
+    #  2. login to the docker registry
+    #  3. run a docker push
+    #
+    # This job supports subprojects.
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     maven-properties: properties passed to maven
+
     name: '{project-name}-{stream}-{subproject}-docker-version-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
           maven-version: '{maven-version}'
 
 - job-template:
+    # Job template for building & pushing docker images for AAI specific repos
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. run maven goals
+    #  3. run include-docker-push.sh
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     maven-properties: properties passed to maven
+
     name: '{project-name}-{stream}-aai-docker-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
           maven-version: '{maven-version}'
 
 - job-template:
+    # Job template for building & pushing docker images for AAI specific repos
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. run maven goals
+    #  3. run include-docker-push.sh
+    #
+    # This job supports subprojects
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     maven-properties: properties passed to maven
+
     name: '{project-name}-{stream}-{subproject}-aai-docker-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
 - job-template:
     # Job template for Java daily release jobs
     #
-    # The purpose of this job template is to run
-    #   - change version in all POM files to the release version specified
-    #     in version.properties. This is done using a script instread of
-    #     the mvn version plugin that assumes some specific parent structure.
-    #   - runs maven clean deploy sonar
+    # The purpose of this job template is to run:
+    # 1. inject a version.properties file and set versions
+    # 2. change version in all POM files to the release version specified
+    #    in version.properties. This is done using a script instread of
+    #    the mvn version plugin that assumes some specific parent structure
     #
     # The POM files are required to use the Maven staging plugin so the deploy
     # does not deploy directly to the release repo.
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
+
     name: '{project-name}-{stream}-release-version2-java-daily'
 
     project-type: freestyle
 
       - maven-target:
           maven-version: '{maven-version}'
-          goals: 'clean deploy sonar:sonar site:site site:stage-deploy
-            -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy site:site site:stage-deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
 - job-template:
     # Job template for Java daily release jobs
     #
-    # The purpose of this job template is to run
-    #   - change version in all POM files to the release version specified
+    # The purpose of this job template is to run:
+    # 1. inject a version.properties file and set versions
+    # 2. change version in all POM files to the release version specified
     #     in version.properties. This is done using a script instread of
-    #     the mvn version plugin that assumes some specific parent structure.
-    #   - runs maven clean deploy sonar
+    #     the mvn version plugin that assumes some specific parent structure
     #
     # The POM files are required to use the Maven staging plugin so the deploy
     # does not deploy directly to the release repo.
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean deploy sonar:sonar site:site site:stage-deploy
-            -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy site:site site:stage-deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
 - job-template:
     # Job template for Java daily release jobs
     #
-    # The purpose of this job template is to run
-    #   - change version in all POM files to the release version specified
+    # The purpose of this job template is to run:
+    #  1. inject a version.properties file and set versions
+    #  2. change version in all POM files to the release version specified
     #     in version.properties. This is done using a script instread of
     #     the mvn version plugin that assumes some specific parent structure
-    #     This version does NOT change the version within the <parent> tag.
-    #   - runs maven clean deploy sonar
+    #     This version does NOT change the version within the <parent> tag
     #
     # The POM files are required to use the Maven staging plugin so the deploy
     # does not deploy directly to the release repo.
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean deploy sonar:sonar site:site site:stage-deploy
-            -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy site:site site:stage-deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
     # succeeds as there's no need for new documentaiton
     # if the build job fails.
     #
+    # The purpose of this job template is to run:
+    # 1. maven set versions
+    # 2. maven clean site
+    #
     # Those parameters should be set :
     # - site-pom : the pom file that contains the site confiration
     # - trigger-job : the name of the project that triggers this job
     #                     upon success. The job name can be
     #                     parameterized.
+
     name: '{project-name}-{stream}-stage-site-java'
     project-type: freestyle
     node: '{build-node}'
           maven-version: '{maven-version}'
 
 - job-template:
-    # Job template for Java merge jobs
+    # Job template for Java merge jobs for SDC specific repos
     #
-    # The purpose of this job template is to run "maven clean deploy" for
-    # projects using this template.
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
+
     name: '{project-name}-{stream}-sdc-merge-java'
 
     project-type: freestyle
           maven-version: '{maven-version}'
 
 - job-template:
+    # Job template for building & pushing docker images for AAI specific repos
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. run maven clean install goals skipping tests
+    #  3. run maven goals
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     maven-properties: properties passed to maven
+
     name: '{project-name}-{stream}-aai-docker-java-version-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
index ec9002e..acd5e17 100644 (file)
@@ -2,8 +2,10 @@
 - job-template:
     # Job template for python verify jobs
     #
-    # The purpose of this job template is to run tox for projects using this
-    # template.
+    # The purpose of this job template is to run:
+    # 1. tox
+    #
+    # This job supports subprojects.
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
           maven-version: '{maven-version}'
 
 - job-template:
+    # Job template for docker daily jobs
+    #
+    # The purpose of this job template is to run:
+    # 1. login into the docker registry
+    # 2. docker build
+    # 3. docker tag
+    # 4. docker push
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
     name: '{project-name}-{stream}-docker-shell-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
           branch: '{branch}'
 
     builders:
-
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
           maven-version: '{maven-version}'
 
 - job-template:
+    # Job template for docker daily jobs for 2 SCMs
+    #
+    # The purpose of this job template is to run:
+    # 1. inject a version properties file
+    # 2. login into the docker registry
+    # 4. run a specified shell script
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
     name: '{project-name}-{stream}-2scm-docker-shell-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
           branch: '{branch}'
 
     builders:
-
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
-
       - inject:
           properties-file: version.properties
-
       - docker-login
-
       - shell: '{script}'
-
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
 - job-template:
+    # Job template for docker daily jobs for 3 SCMs
+    #
+    # The purpose of this job template is to run:
+    # 1. inject a version properties file
+    # 2. login into the docker registry
+    # 4. run a specified shell script
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
     name: '{project-name}-{stream}-3scm-docker-shell-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
           branch: '{branch}'
 
     builders:
-
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
-
       - inject:
           properties-file: version.properties
-
       - docker-login
-
       - shell: '{script}'
-
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
-
index 4b2fa31..77e8b65 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'holmes-common-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: holmes-common-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'holmes/common'
+    project-name: 'holmes-common'
+    branch: 'master'
+    mvn-settings: 'holmes-common-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 592cfd8..e651106 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'holmes-dsa-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: holmes-dsa-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'holmes/dsa'
+    project-name: 'holmes-dsa'
+    branch: 'master'
+    mvn-settings: 'holmes-dsa-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 5e10776..5573ec7 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'holmes-engine-management-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: holmes-engine-management-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'holmes/engine-management'
+    project-name: 'holmes-engine-management'
+    branch: 'master'
+    mvn-settings: 'holmes-engine-management-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index d88aef4..c739e07 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'holmes-rule-management-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: holmes-rule-management-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'holmes/rule-management'
+    project-name: 'holmes-rule-management'
+    branch: 'master'
+    mvn-settings: 'holmes-rule-management-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/integration/integration-bootstrap.yaml b/jjb/integration/integration-bootstrap.yaml
new file mode 100644 (file)
index 0000000..51dc932
--- /dev/null
@@ -0,0 +1,18 @@
+---
+- project:
+    name: integration-bootstrap
+    project-name: 'integration'
+    project: 'integration'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
+    subproject:
+      - 'vagrant-onap':
+          path: 'bootstrap/vagrant-onap'
+          pattern: 'bootstrap/vagrant-onap/**'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'integration-settings'
+    build-node: ubuntu1604-basebuild-2c-1g
index 5c5d39c..f4c2afc 100644 (file)
@@ -5,11 +5,14 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'integration'
-    stream: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     functionality:
       - 'functionality1':
           trigger_jobs:
       - 'vCPE':
           trigger_jobs:
     robot-options: ''
-    branch: 'master'
index 92125d4..2730cbb 100644 (file)
@@ -9,6 +9,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     subproject:
       - 'sniroemulator':
           pom: 'test/mocks/sniroemulator/pom.xml'
index ccba91a..1cd96b4 100644 (file)
       - integration-run-test
 
     publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
-      - lf-infra-publish
       - testng:
           pattern: archives/testng-results.xml
           escape-test-description: true
           escape-exception-msg: true
           show-failed-builds: true
+          unstable-on-skipped-tests: false
+          failure-on-failed-test-config: false
+      - junit:
+          results: archives/testng-results.xml
+          health-scale-factor: 1.0
+          allow-empty-results: true
+      - integration-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
       - html-publisher:
-          allow-missing: false
+          allow-missing: true
           dir: '{html-dir}'
           files: '{html-files}'
           keep-all: false
           link-to-last-build: false
           name: ExtentReport
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-{stream}-csit-{functionality}'
           unstable-if: 0.0
           pass-if: 100.0
       - lf-infra-publish
+
+- job-template:
+    name: '{project-name}-{stream}-csit-{functionality}-testng'
+    disabled: false
+
+    project-type: freestyle
+    build-node: 'ubuntu1604-docker-8c-8g'
+    node: '{build-node}'
+
+    properties:
+      - lf-infra-properties:
+          project: 'integration'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: 'integration'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-test-plan:
+          test-plan: 'plans/{project-name}/{functionality}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+      - html-publisher-dir:
+          html-dir: '{html-dir}'
+      - html-publisher-files:
+          html-files: '{html-files}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          server: '{server-name}'
+          project: 'integration'
+          branch: '{branch}'
+          files: 'test/csit/**/{project-name}/**'
+      - timed: '@daily'
+      - reverse:
+          jobs: '{obj:trigger_jobs}'
+
+    builders:
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-test
+
+    publishers:
+      - integration-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - testng:
+          pattern: archives/testng-results.xml
+          escape-test-description: true
+          escape-exception-msg: true
+          show-failed-builds: true
+          unstable-on-skipped-tests: false
+          failure-on-failed-test-config: false
+      - junit:
+          results: archives/testng-results.xml
+          health-scale-factor: 1.0
+          allow-empty-results: true
+      - html-publisher:
+          allow-missing: true
+          dir: '{html-dir}'
+          files: '{html-files}'
+          keep-all: false
+          link-to-last-build: false
+          name: ExtentReport
+      - lf-infra-publish
index adfd885..816c006 100644 (file)
@@ -14,6 +14,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/lab/include-raw-lab-retrieve-logs.sh b/jjb/lab/include-raw-lab-retrieve-logs.sh
new file mode 100644 (file)
index 0000000..6335e49
--- /dev/null
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -xe -o pipefail
+
+echo Job triggered by $SRC_BUILD_URL
+echo Retriving logs from $LOG_DIR_URL
+
+rm -rf archives
+wget -r -nv -nd --no-parent -l 1 --reject="index.html*" -P archives "$LOG_DIR_URL"
+cat archives/console.log
diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml
new file mode 100644 (file)
index 0000000..b353440
--- /dev/null
@@ -0,0 +1,36 @@
+---
+- job-template:
+    name: 'lab-{job-name}'
+    description: '{job-desc}'
+    disabled: false
+    project-type: freestyle
+    build-node: ubuntu1604-basebuild-2c-1g
+
+    properties:
+      - lf-infra-properties:
+          project: 'integration'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - string:
+          name: LOG_DIR_URL
+          description: 'URL for the log directory produced by the external job'
+      - string:
+          name: SRC_BUILD_URL
+          description: 'URL for the external Jenkins build triggering this build'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    builders:
+      - shell:
+          !include-raw:
+          - include-raw-lab-retrieve-logs.sh
+
+    publishers:
+      - integration-robot:
+          unstable-if: 75.0
+          pass-if: 100.0
+      - lf-infra-publish
diff --git a/jjb/lab/lab.yaml b/jjb/lab/lab.yaml
new file mode 100644 (file)
index 0000000..a06339e
--- /dev/null
@@ -0,0 +1,16 @@
+---
+- project:
+    name: lab
+    jobs:
+      - 'lab-{job-name}'
+    job-name:
+      - "windriver-beijing-heat-deploy":
+          job-desc: "Heat-based deployment into Wind River lab Integration-Stable tenant"
+      - "windriver-beijing-oom-deploy":
+          job-desc: "OOM-based deployment into Wind River lab Integration-Jenkins tenant"
+      - "tlab-beijing-heat-deploy":
+          job-desc: "Heat-based deployment into AT&T TLAB Integration-HEAT-Test tenant"
+      - "tlab-beijing-oom-deploy":
+          job-desc: "OOM-based deployment into AT&T TLAB Integration-OOM-Test tenant"
+      - "aws-beijing-oom-deploy":
+          job-desc: "OOM-based deployment into AWS"
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
new file mode 100644 (file)
index 0000000..5c43361
--- /dev/null
@@ -0,0 +1,39 @@
+---
+- project:
+    name: logging-analytics
+    project-name: 'logging-analytics'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-version-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'logging-analytics'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'logging-analytics-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: logging-analytics-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'logging-analytics'
+    project-name: 'logging-analytics'
+    branch: 'master'
+    mvn-settings: 'logging-analytics-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 2b76968..f548c95 100644 (file)
           skip.docker.build=false
           skip.docker.tag=false
           skip.docker.push=false
+- project:
+    name: modeling-toscaparsers-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'modeling/toscaparsers'
+    project-name: 'modeling-toscaparsers'
+    branch: 'master'
+    mvn-params: '-f javatoscachecker/pom.xml'
+    mvn-settings: 'modeling-toscaparsers-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index f7c03ea..eff1168 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'modeling-toscaparsers-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     subproject:
@@ -21,4 +23,4 @@
           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-no-sonar'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
index 1035ec2..484f2af 100644 (file)
@@ -8,9 +8,6 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'msb-apigateway-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: msb-apigateway-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'msb/apigateway'
+    project-name: 'msb-apigateway'
+    branch: 'master'
+    mvn-settings: 'msb-apigateway-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 5f5702a..1c46883 100644 (file)
@@ -8,9 +8,6 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'msb-discovery-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: msb-discovery-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'msb/discovery'
+    project-name: 'msb-discovery'
+    branch: 'master'
+    mvn-settings: 'msb-discovery-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 7bacfd9..effdecc 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'msb-java-sdk-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: msb-java-sdk-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'msb/java-sdk'
+    project-name: 'msb-java-sdk'
+    branch: 'master'
+    mvn-settings: 'msb-java-sdk-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 90b12b1..2112551 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'msb-swagger-sdk-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: msb-swagger-sdk-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'msb/swagger-sdk'
+    project-name: 'msb-swagger-sdk'
+    branch: 'master'
+    mvn-settings: 'msb-swagger-sdk-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 9f140ce..780a62a 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'multicloud-framework-settings'
     subproject:
       - 'multivimbroker':
@@ -14,7 +16,7 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: multicloud-framework-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'multicloud/framework'
+    project-name: 'multicloud-framework'
+    branch: 'master'
+    mvn-settings: 'multicloud-framework-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 4fcad3e..aec4398 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'multicloud-framework-settings'
     build-node: 'ubuntu1604-basebuild-4c-4g'
     subproject:
index 6b6e9a6..d07bdb7 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'multicloud-openstack-vmware-settings'
     subproject:
       - 'vio':
@@ -14,7 +16,7 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: multicloud-openstack-vmware-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'multicloud/openstack/vmware'
+    project-name: 'multicloud-openstack-vmware'
+    branch: 'master'
+    mvn-settings: 'multicloud-openstack-vmware-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 62e52f2..c66e13d 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'multicloud-openstack-vmware-settings'
     build-node: 'ubuntu1604-basebuild-4c-4g'
     subproject:
index 1d4fa6b..9631f1d 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'multicloud-openstack-vmware-settings'
     subproject:
       - 'vesagent':
index 0a8fcd4..15a0c2c 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'multicloud-openstack-vmware-settings'
     build-node: 'ubuntu1604-basebuild-4c-4g'
     subproject:
index 655bd8c..4677b1d 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'multicloud-openstack-settings'
     subproject:
       - 'newton':
           path: 'ocata'
           pattern: 'ocata/**'
           pom: 'ocata/pom.xml'
+      - 'ocata_share':
+          path: 'ocata'
+          pattern: 'share/**'
+          pom: 'ocata/pom.xml'
       - 'windriver':
           path: 'windriver'
           pattern: 'windriver/**'
@@ -24,7 +30,7 @@
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-memcached-4c-4g'
+- project:
+    name: multicloud-openstack-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'multicloud/openstack'
+    project-name: 'multicloud-openstack'
+    branch: 'master'
+    mvn-settings: 'multicloud-openstack-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
new file mode 100644 (file)
index 0000000..65abe01
--- /dev/null
@@ -0,0 +1,40 @@
+---
+- project:
+    name: music
+    project-name: 'music'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-version-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: docker
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+          build-node: 'ubuntu1604-basebuild-8c-8g'
+
+    project: 'music'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'music-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
+
+- project:
+    name: music-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'music'
+    project-name: 'music'
+    branch: 'master'
+    mvn-settings: 'music-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
index 3f2088c..0805d41 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: oom-registrator-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'oom/registrator'
+    project-name: 'oom-registrator'
+    branch: 'master'
+    mvn-settings: 'oom-registrator-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index ff6c9dc..bb674dd 100644 (file)
@@ -12,7 +12,7 @@
       - '{project-name}-{stream}-{subproject}-release-version3-java-daily'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
     project: 'oparent'
     stream:
       - 'master':
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: oparent-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'oparent'
+    project-name: 'oparent'
+    branch: 'master'
+    mvn-settings: 'oparent-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/optf/optf-has-python.yaml b/jjb/optf/optf-has-python.yaml
new file mode 100644 (file)
index 0000000..81b215d
--- /dev/null
@@ -0,0 +1,16 @@
+---
+- project:
+    name: optf-has
+    project-name: 'optf-has'
+    project: 'optf/has'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'optf-has-settings'
+    build-node: 'ubuntu1604-basebuild-4c-4g'
+    subproject:
+      - 'conductor':
+          path: 'conductor'
+          pattern: 'conductor/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
diff --git a/jjb/optf/optf-osdf-python.yaml b/jjb/optf/optf-osdf-python.yaml
new file mode 100644 (file)
index 0000000..2daaedd
--- /dev/null
@@ -0,0 +1,16 @@
+---
+- project:
+    name: optf-osdf
+    project-name: 'optf-osdf'
+    project: 'optf/osdf'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'optf-osdf-settings'
+    build-node: 'ubuntu1604-basebuild-4c-4g'
+    subproject:
+      - 'osdf':
+          path: '.'
+          pattern: '**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
index 131695e..c92d6d4 100644 (file)
@@ -7,10 +7,10 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
 
     project: 'policy/api'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: policy-api-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'policy/api'
+    project-name: 'policy-api'
+    branch: 'master'
+    mvn-settings: 'policy-api-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index a844d05..779dbce 100644 (file)
@@ -26,7 +26,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java-skip-tests'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: policy-common-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'policy/common'
+    project-name: 'policy-common'
+    branch: 'master'
+    mvn-settings: 'policy-common-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index f463a2c..93d277e 100644 (file)
@@ -26,7 +26,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-basebuild-4c-4g'
+- project:
+    name: policy-drools-applications-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'policy/drools-applications'
+    project-name: 'policy-drools-applications'
+    branch: 'master'
+    mvn-settings: 'policy-drools-applications-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index ada359f..ddf6fd1 100644 (file)
@@ -27,7 +27,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-basebuild-4c-4g'
+- project:
+    name: policy-drools-pdp-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'policy/drools-pdp'
+    project-name: 'policy-drools-pdp'
+    branch: 'master'
+    mvn-settings: 'policy-drools-pdp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index ceb228e..a66e006 100644 (file)
@@ -27,7 +27,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-basebuild-4c-4g'
+- project:
+    name: policy-engine-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'policy/engine'
+    project-name: 'policy-engine'
+    branch: 'master'
+    mvn-settings: 'policy-engine-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index fb3206a..b72be36 100644 (file)
@@ -7,10 +7,10 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
 
     project: 'policy/gui'
     stream:
     mvn-settings: 'policy-gui-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: policy-gui-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'policy/gui'
+    project-name: 'policy-gui'
+    branch: 'master'
+    mvn-settings: 'policy-gui-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index c0407e9..6f6d3a1 100644 (file)
@@ -7,10 +7,10 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
 
     project: 'policy/pap'
     stream:
     mvn-settings: 'policy-pap-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: policy-pap-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'policy/pap'
+    project-name: 'policy-pap'
+    branch: 'master'
+    mvn-settings: 'policy-pap-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 31c7b5b..1c73389 100644 (file)
@@ -7,10 +7,10 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
 
     project: 'policy/pdp'
     stream:
     mvn-settings: 'policy-pdp-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: policy-pdp-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'policy/pdp'
+    project-name: 'policy-pdp'
+    branch: 'master'
+    mvn-settings: 'policy-pdp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 67a518a..c5e7cb8 100644 (file)
@@ -21,6 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
       - 'release-1.3.1':
           branch: 'release-1.3.1'
       - 'release-1.3.2':
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: portal-sdk-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'portal/sdk'
+    project-name: 'portal-sdk'
+    branch: 'master'
+    mvn-params: '-f ecomp-sdk/pom.xml'
+    mvn-settings: 'portal-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index e16aa1a..a93091c 100644 (file)
@@ -3,6 +3,8 @@
     name: portal
     project-name: 'portal'
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{project-name}-{stream}-release-java-daily'
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
     maven-deploy-properties: -Dbuild.number=$BUILD_NUMBER
+- project:
+    name: portal-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'portal'
+    project-name: 'portal'
+    branch: 'master'
+    mvn-settings: 'portal-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 5a4c9bf..dfd0905 100644 (file)
@@ -2,12 +2,14 @@
 - project:
     name: sdc-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
+      - '{project-name}-{stream}-verify-csit-{functionality}-testng'
+      - '{project-name}-{stream}-csit-{functionality}-testng'
     project-name: 'sdc'
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     functionality:
       - 'sanity':
           trigger_jobs:
@@ -17,3 +19,5 @@
             - '{project-name}-{stream}-docker-version-java-daily'
     robot-options: ''
     branch: 'master'
+    html-dir: 'archives'
+    html-files: 'SDC_CI_Extent_Report.html'
\ No newline at end of file
index 7cd6094..5876322 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.1.0':
-          branch: 'release-1.1.0'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'sdc-jtosca-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+- project:
+    name: sdc-jtosca-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'sdc/jtosca'
+    project-name: 'sdc-jtosca'
+    branch: 'master'
+    mvn-settings: 'sdc-jtosca-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 186ae14..518482c 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.1.0':
-          branch: 'release-1.1.0'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+- project:
+    name: sdc-sdc-distribution-client-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'sdc/sdc-distribution-client'
+    project-name: 'sdc-sdc-distribution-client'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-distribution-client-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 6b59c52..3c765da 100644 (file)
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''
index df39d92..74a62ea 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'sdc-sdc-titan-cassandra-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+- project:
+    name: sdc-sdc-titan-cassandra-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'sdc/sdc-titan-cassandra'
+    project-name: 'sdc-sdc-titan-cassandra'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-titan-cassandra-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 4381189..5ed7e82 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.1.0':
-          branch: 'release-1.1.0'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'sdc-sdc-tosca-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+- project:
+    name: sdc-sdc-tosca-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'sdc/sdc-tosca'
+    project-name: 'sdc-sdc-tosca'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-tosca-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 139ac95..8279d4c 100644 (file)
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: sdc-sdc-workflow-designer-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'sdc/sdc-workflow-designer'
+    project-name: 'sdc-sdc-workflow-designer'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-workflow-designer-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 3dd9df6..17e8abf 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.1.0':
-          branch: 'release-1.1.0'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-8c-8g
+- project:
+    name: sdc-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'sdc'
+    project-name: 'sdc'
+    branch: 'master'
+    mvn-settings: 'sdc-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 3a8b5b5..991ed93 100644 (file)
@@ -7,7 +7,7 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java-skip-tests'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'sdnc/adaptors'
     stream:
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: sdnc-adaptors-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'sdnc/adaptors'
+    project-name: 'sdnc-adaptors'
+    branch: 'master'
+    mvn-settings: 'sdnc-adaptors-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 17ee14f..090ea6b 100644 (file)
           java-version: ''
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-java-daily-no-sonar'
+      - '{project-name}-{stream}-{subproject}-release-java-daily'
       - '{project-name}-{stream}-verify-java-skip-tests'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'sdnc/core'
     stream:
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-2g
+- project:
+    name: sdnc-core-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'sdnc/core'
+    project-name: 'sdnc-core'
+    branch: 'master'
+    mvn-settings: 'sdnc-core-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index e78d50b..3e1ec1c 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: sdnc-northbound-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'sdnc/northbound'
+    project-name: 'sdnc-northbound'
+    branch: 'master'
+    mvn-settings: 'sdnc-northbound-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 487ab04..c5cc0fd 100644 (file)
@@ -8,7 +8,7 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: sdnc-oam-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'sdnc/oam'
+    project-name: 'sdnc-oam'
+    branch: 'master'
+    mvn-settings: 'sdnc-oam-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 1e62e70..06774de 100644 (file)
@@ -7,7 +7,7 @@
           java-version: ''
       - '{project-name}-{stream}-verify-java-skip-tests'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'sdnc/plugins'
     stream:
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: sdnc-plugins-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'sdnc/plugins'
+    project-name: 'sdnc-plugins'
+    branch: 'master'
+    mvn-settings: 'sdnc-plugins-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index cf266a5..f4323e9 100644 (file)
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     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
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: so-libs-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'so/libs'
+    project-name: 'so-libs'
+    branch: 'master'
+    mvn-settings: 'so-libs-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 7278f0f..cc4a6dd 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: so-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'so'
+    project-name: 'so'
+    branch: 'master'
+    mvn-settings: 'so-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index ee9f5e6..576cfe6 100644 (file)
@@ -13,6 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'testsuite-heatbridge-settings'
     files: '**'
     archive-artifacts: ''
index 516a177..01fca0d 100644 (file)
@@ -14,6 +14,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
       - 'release-1.0.0':
           branch: 'release-1.0.0'
     mvn-settings: 'testsuite-python-testing-utils-settings'
index 80897db..0ff88fe 100644 (file)
@@ -26,6 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
       - 'release-1.0.0':
           branch: 'release-1.0.0'
     mvn-settings: 'testsuite-settings'
index 9f7d0f7..4ec21ad 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: ui-dmaapbc-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'ui/dmaapbc'
+    project-name: 'ui-dmaapbc'
+    branch: 'master'
+    mvn-settings: 'ui-dmaapbc-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 727c603..fc62975 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'usecase-ui-server-settings'
     jobs:
       - '{project-name}-{stream}-verify-java'
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: usecase-ui-server-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'usecase-ui/server'
+    project-name: 'usecase-ui-server'
+    branch: 'master'
+    mvn-settings: 'usecase-ui-server-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 69c7f83..749cf2b 100644 (file)
@@ -7,14 +7,28 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'usecase-ui-settings'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: usecase-ui-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-8c-8g
+    java-version: ''
+    project: 'usecase-ui'
+    project-name: 'usecase-ui'
+    branch: 'master'
+    mvn-settings: 'usecase-ui-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index db1b504..2f33312 100755 (executable)
@@ -11,5 +11,6 @@ chmod 755 ./zte/vmanager/docker/*.*
 chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.*
 ./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
 
-chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.*
-./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
\ No newline at end of file
+cd nokia/deployment
+mvn package -Dexec.args="buildDocker pushImage"
+
index fc85d57..da2c234 100644 (file)
@@ -7,15 +7,19 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-gvnfm-vnflcm-settings'
     subproject:
       - 'lcm':
           pom: 'lcm/pom.xml'
           pattern: 'lcm/**'
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
             !include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-gvnfm-vnflcm-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vfc/gvnfm/vnflcm'
+    project-name: 'vfc-gvnfm-vnflcm'
+    branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnflcm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 991848a..cf623e2 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-gvnfm-vnflcm-settings'
     build-node: centos7-redis-4c-4g
     subproject:
index 2aedb0f..3f5455c 100644 (file)
@@ -6,15 +6,19 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
     subproject:
       - 'mgr':
           pom: 'mgr/pom.xml'
           pattern: 'mgr/**'
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
             !include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-gvnfm-vnfmgr-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vfc/gvnfm/vnfmgr'
+    project-name: 'vfc-gvnfm-vnfmgr'
+    branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 9de9b0f..eff84ad 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     subproject:
index 22a103d..5460d26 100644 (file)
@@ -7,15 +7,19 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-gvnfm-vnfres-settings'
     subproject:
       - 'res':
           pom: 'res/pom.xml'
           pattern: 'res/**'
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
             !include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-gvnfm-vnfres-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vfc/gvnfm/vnfres'
+    project-name: 'vfc-gvnfm-vnfres'
+    branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnfres-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index db7762f..9a48666 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-gvnfm-vnfres-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     subproject:
index ec079cd..0e23d1f 100644 (file)
@@ -7,16 +7,20 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-nfvo-catalog-settings'
     subproject:
       - 'catalog':
           path: '.'
           pattern: '**'
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
+- project:
+    name: vfc-nfvo-catalog-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vfc/nfvo/catalog'
+    project-name: 'vfc-nfvo-catalog'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-catalog-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 5933f21..5d32025 100644 (file)
@@ -1,26 +1,42 @@
----\r
-\r
-- project:\r
-    name: vfc-nfvo-driver-ems-java\r
-    project-name: 'vfc-nfvo-driver-ems'\r
-    project: 'vfc/nfvo/driver/ems'\r
-    stream:\r
-      - 'master':\r
-          branch: 'master'\r
-    mvn-settings: 'vfc-nfvo-driver-ems-settings'\r
-    subproject:\r
-      - 'drv-ems-boco':\r
-          pom: 'ems/pom.xml'\r
-          pattern: 'ems/**'\r
-    jobs:\r
-      - '{project-name}-{stream}-{subproject}-verify-java'\r
-      - '{project-name}-{stream}-{subproject}-merge-java'\r
-      - '{project-name}-{stream}-release-version-java-daily'\r
-      - '{project-name}-{stream}-docker-java-version-shell-daily':\r
-          docker-pom: 'pom.xml'\r
-          mvn-goals: 'install'\r
-          script:\r
-            !include-raw-escape: 'build-driver-ems-docker-image.sh'\r
-    files: '**'\r
-    archive-artifacts: ''\r
-    build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
+---
+
+- project:
+    name: vfc-nfvo-driver-ems-java
+    project-name: 'vfc-nfvo-driver-ems'
+    project: 'vfc/nfvo/driver/ems'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
+    mvn-settings: 'vfc-nfvo-driver-ems-settings'
+    subproject:
+      - 'drv-ems-boco':
+          pom: 'ems/pom.xml'
+          pattern: 'ems/**'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-driver-ems-docker-image.sh'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-driver-ems-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vfc/nfvo/driver/ems'
+    project-name: 'vfc-nfvo-driver-ems'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-ems-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index d995db4..79edfb1 100644 (file)
@@ -6,12 +6,16 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-nfvo-driver-sfc-settings'
     subproject:
       - 'driver-sfc-zte':
           pom: 'zte/sfc-driver/pom.xml'
           pattern: 'zte/sfc-driver/**'
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{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-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-driver-sfc-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vfc/nfvo/driver/sfc'
+    project-name: 'vfc-nfvo-driver-sfc'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-sfc-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index cc2c865..c7e827e 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
     subproject:
       - 'drv-vnfm-huawei':
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-driver-svnfm-huawei-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    mvn-params: '-f huawei/pom.xml'
+    java-version: ''
+    project: 'vfc/nfvo/driver/vnfm/svnfm'
+    project-name: 'vfc-nfvo-driver-svnfm-huawei'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 8199331..215c10a 100644 (file)
@@ -7,15 +7,19 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
     subproject:
       - 'gvnfmadapter':
           pom: 'gvnfmadapter/pom.xml'
           pattern: 'gvnfmadapter/**'
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
             !include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-driver-vnfm-gvnfm-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vfc/nfvo/driver/vnfm/gvnfm'
+    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index a1af3b7..a53ec8c 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
     subproject:
       - 'gvnfm-juju':
index a1a7d23..ed26232 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     subproject:
index 8698735..544dcb6 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
     jobs:
       - '{project-name}-{stream}-docker-java-version-shell-daily':
             !include-raw-escape: 'build-nfvo-svnfm-driver-docker-image.sh'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-driver-vnfm-svnfm-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vfc/nfvo/driver/vnfm/svnfm'
+    project-name: 'vfc-nfvo-driver-vnfm-svnfm'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
index c14b7a9..ae29db7 100644 (file)
@@ -6,15 +6,32 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
     subproject:
       - 'drv-vnfm-nokia':
-          pom: 'nokia/vnfmdriver/pom.xml'
-          pattern: 'nokia/vnfmdriver/**'
+          pom: 'nokia/pom.xml'
+          pattern: 'nokia/**'
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{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-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-driver-vnfm-svnfm-nokia-sonar
+    jobs:
+      - gerrit-maven-sonar
+    mvn-params: '-f nokia/pom.xml'
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vfc/nfvo/driver/vnfm/svnfm'
+    project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokia'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index d35cc4d..880e976 100644 (file)
@@ -7,15 +7,32 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
     subproject:
       - 'drv-vnfm-zte':
           pom: 'zte/vmanager/pom.xml'
           pattern: 'zte/vmanager/**'
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-driver-vnfm-svnfm-zte-sonar
+    jobs:
+      - gerrit-maven-sonar
+    mvn-params: '-f zte/vmanager/pom.xml'
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vfc/nfvo/driver/vnfm/svnfm'
+    project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 79a3923..6980432 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     subproject:
index 2f0faed..488f42d 100644 (file)
@@ -7,11 +7,15 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-nfvo-lcm-settings'
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
             !include-raw-escape: 'build-nfvo-lcm-docker-image.sh'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-lcm-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vfc/nfvo/lcm'
+    project-name: 'vfc-nfvo-lcm'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-lcm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 8fc3b9e..7662f83 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-nfvo-lcm-settings'
     build-node: centos7-redis-4c-4g
     subproject:
index 2dc778d..fab44e6 100644 (file)
@@ -8,8 +8,12 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     build-node: ubuntu1604-basebuild-4c-4g
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh'
+- project:
+    name: vfc-nfvo-resmanagement-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vfc/nfvo/resmanagement'
+    project-name: 'vfc-nfvo-resmanagement'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-resmanagement-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 570909b..d32e03c 100644 (file)
@@ -7,6 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-nfvo-wfengine-settings'
     subproject:
       - 'engine-mgr-service':
@@ -20,6 +22,8 @@
           script:
             !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh'
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{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-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-wfengine-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vfc/nfvo/wfengine'
+    project-name: 'vfc-nfvo-wfengine'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-wfengine-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index d8f09de..3b9935c 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: vid-asdcclient-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vid/asdcclient'
+    project-name: 'vid-asdcclient'
+    branch: 'master'
+    mvn-settings: 'vid-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index c8438e0..90508a3 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vid-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vid'
+    project-name: 'vid'
+    branch: 'master'
+    mvn-settings: 'vid-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 400b152..94f6471 100644 (file)
@@ -6,7 +6,7 @@
       - gerrit-maven-clm:
           java-version: ''
           mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
-      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-aai-docker-java-daily':
           mvn-profile: 'docker'
 
     project: 'vnfsdk/compliance'
+    subproject:
+      - 'veslibrary':
+          pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
+          pattern: 'veslibrary/**'
     stream:
       - 'master':
           branch: 'master'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vnfsdk-compliance-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vnfsdk/compliance'
+    project-name: 'vnfsdk-compliance'
+    branch: 'master'
+    mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
+    mvn-settings: 'vnfsdk-compliance-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 6ff0a58..2a08484 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vnfsdk-refrepo-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vnfsdk/refrepo'
+    project-name: 'vnfsdk-refrepo'
+    branch: 'master'
+    mvn-settings: 'vnfsdk-refrepo-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 1d28556..2775226 100644 (file)
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vnfsdk-validation-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vnfsdk/validation'
+    project-name: 'vnfsdk-validation'
+    branch: 'master'
+    mvn-settings: 'vnfsdk-validation-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index fefc29c..87d0cd3 100644 (file)
     mvn-settings: 'vvp-jenkins-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     jobs:
+      - gerrit-maven-clm:
+          java-version: ''
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
+- project:
+    name: vvp-jenkins-sonar
+    jobs:
+      - gerrit-maven-sonar
+    build-node: ubuntu1604-basebuild-4c-4g
+    java-version: ''
+    project: 'vvp/jenkins'
+    project-name: 'vvp-jenkins'
+    branch: 'master'
+    mvn-settings: 'vvp-jenkins-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file