Merge "Add stable/lithium builders for controller"
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Fri, 24 Apr 2015 15:30:35 +0000 (15:30 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 24 Apr 2015 15:30:35 +0000 (15:30 +0000)
82 files changed:
jenkins-scripts/controller.sh
jenkins-scripts/mininet.sh
jjb-templates/clm.yaml [new file with mode: 0644]
jjb-templates/daily.yaml
jjb-templates/integration.yaml
jjb-templates/merge.yaml
jjb-templates/sonar.yaml
jjb-templates/verify.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto.yaml
jjb/autorelease/autorelease-lithium.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-master.yaml [new file with mode: 0644]
jjb/autorelease/include-raw-autorelease-release-versions.sh
jjb/bgpcep/bgpcep-python.yaml
jjb/bgpcep/bgpcep.yaml
jjb/capwap/capwap.yaml
jjb/controller/controller.cfg
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/defense4all/defense4all.yaml
jjb/didm/didm.yaml
jjb/discovery/discovery.yaml
jjb/dlux/dlux.yaml
jjb/docs/docs.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/integration/include-raw-integration-deploy-controller-offline.sh
jjb/integration/include-raw-integration-deploy-controller-run-test.sh
jjb/integration/integration-jobs.yaml
jjb/integration/integration-macros.yaml
jjb/integration/integration-python.yaml
jjb/integration/integration-templates.yaml
jjb/integration/openflowplugin-csit-scalability-master.yaml [new file with mode: 0644]
jjb/iotdm/iotdm.cfg
jjb/iotdm/iotdm.yaml
jjb/l2switch/l2switch-csit-scalability-master.yaml [new file with mode: 0644]
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/neutron/include-raw-openstack-ci.sh [new file with mode: 0644]
jjb/neutron/neutron-daily-openstack-master.yaml [new file with mode: 0644]
jjb/neutron/neutron.yaml
jjb/nic/nic.yaml
jjb/odlparent/odlparent.cfg [new file with mode: 0644]
jjb/odlparent/odlparent.yaml
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-daily-master.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-config-performance-master.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml
jjb/openflowplugin/openflowplugin.cfg
jjb/openflowplugin/openflowplugin.yaml
jjb/ovsdb/ovsdb-custom.yaml
jjb/ovsdb/ovsdb-daily-openstack-master.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-openstack.yaml
jjb/ovsdb/ovsdb.yaml
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/releng-jobs.yaml
jjb/releng-macros.yaml
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc-python.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp.yaml
jjb/tcpmd5/tcpmd5.yaml
jjb/toolkit/toolkit.cfg [new file with mode: 0644]
jjb/toolkit/toolkit.yaml [new file with mode: 0644]
jjb/topoprocessing/topoprocessing.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/usc/usc.yaml
jjb/vpnservice/vpnservice.yaml
jjb/vtn/vtn.yaml
jjb/yangtools/yangtools-verify.yaml
jjb/yangtools/yangtools.cfg
jjb/yangtools/yangtools.yaml
scripts/jjb-init-project.py

index 12cb6e6977f0e4860860f7f5059a5ec64b8679a7..fe4611f8e9ee251d7649d86da0c417b4764b36b1 100755 (executable)
@@ -3,4 +3,12 @@
 # disable the firewall
 service iptables stop
 
+# install sshpass
+yum install -y sshpass
+
 # vim: sw=2 ts=2 sts=2 et :
+
+cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
+Defaults:jenkins !requiretty
+jenkins     ALL = NOPASSWD: /sbin/iptables
+EOF
index 26e0e0f3be8aa45ec4af99f429889d07ce8f3ff7..ec17a578afb2387492740309113481e6703b63b4 100755 (executable)
@@ -1,5 +1,29 @@
 #!/bin/bash
 
+# for whatever reason netopeer & CPqD aren't installed (they weren't in
+# one of the yum repos we were hooked up to when the base image was
+# built, they are now. Make sure they're install
+yum install -q -y netopeer-server-sl CPqD-ofsoftswitch13
+
+# the vagrant configuration for netopeer doesn't configure SSH correctly
+# as it uses and here document via echo and not cat fix that
+cat << EOSSH >> /etc/ssh/sshd_config
+
+# Added for netconf / netopeer testing
+Port 22
+Port 830
+Subsystem netconf /usr/bin/netopeer-server-sl
+EOSSH
+
+# sshd has to get a restart because of the above
+service sshd restart
+
+# found out while doing testing to fix netopeer that the selinux perms
+# aren't set correctly (thanks Rackspace for having an EL6 image that
+# didn't have selinux on at first!) fix it so that the password can be
+# set
+/sbin/restorecon -R /etc
+
 # According to Luis in RT7956 the controller SSH capabilities require
 # that for NETCONF it uses a password (how broken!) So we're going to
 # force a password onto the jenkins user
diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml
new file mode 100644 (file)
index 0000000..2046957
--- /dev/null
@@ -0,0 +1,50 @@
+- job-template:
+    name: 'PROJECT-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{PROJECT-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: PROJECT
+
+    publishers:
+        - email-notification:
+            email-prefix: '[PROJECT]'
index 062d03fd9572f0508769b6575070c9c61a414d1a..626e12d9edf6e56d338c7aa3fcc0ad89e66bbe40 100644 (file)
@@ -33,7 +33,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
index d3488c6abd59751979e6106606e345528d449625..cbe6e7422cf03a89afdc0683a027ef8cb0e5ea61 100644 (file)
@@ -34,7 +34,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
index 2f134110d8b499629455a5f3415b6d32b3a162d3..c29e35f9c792bad66d76cc6c9bd7c1ed4febb7c7 100644 (file)
@@ -33,7 +33,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
index d6f0d1139983fd0adada81f4f6a910e495be28bd..d7bdaf57b4a837fc52efbd84dd38ed58110e4faa 100644 (file)
@@ -24,7 +24,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
index d2f80d7d0df100c00dc1b866284b55bd16f35f4f..1f3efe5ad8245c806414e60fd3409620cd7a2579 100644 (file)
@@ -45,7 +45,8 @@ JDKS
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -65,6 +66,7 @@ JDKS
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[PROJECT]'
         - jacoco-report
index d377681d0a5d40dc4c471d8d0d67e494e6f318e8..47f9d3b2ed8f1e4e3ad27e55ec4780d91f28d100 100644 (file)
@@ -11,6 +11,7 @@
         - 'aaa-daily-{stream}'
         - 'aaa-integration-{stream}'
         - 'aaa-sonar'
+        - 'aaa-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[aaa]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[aaa]'
         - jacoco-report
 
+- job-template:
+    name: 'aaa-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{aaa-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: aaa
+
+    publishers:
+        - email-notification:
+            email-prefix: '[aaa]'
+
index 0d2b499b9e85b666029efb2492783301bf87ae1d..061151cd37ddeea80349ab4fa3998f3d60c37d1e 100644 (file)
@@ -11,6 +11,7 @@
         - 'alto-daily-{stream}'
         - 'alto-integration-{stream}'
         - 'alto-sonar'
+        - 'alto-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[alto]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[alto]'
         - jacoco-report
 
+- job-template:
+    name: 'alto-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{alto-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: alto
+
+    publishers:
+        - email-notification:
+            email-prefix: '[alto]'
+
index 4d9ea466acfd6611a853b15574a93a4770d70901..3cf87e56af0edd53a0bf8632f3504de63ec3bab6 100644 (file)
@@ -1,16 +1,12 @@
 # Lithium build jobs
 
 - project:
-    name: autorelease
+    name: autorelease-lithium
     jobs:
         - 'autorelease-daily-lithium'
+        - 'autorelease-release-lithium'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
-    stream:
-        - master:
-            branch: 'master'
-
+    branch: 'stable/lithium'
     project: 'releng/autorelease'
     jdk: 'openjdk7'
 
@@ -32,6 +28,8 @@
             project: '{project}'
         - autorelease-release-tag:
             release-tag: 'Daily'
+        - autorelease-release-branch:
+            release-branch: '{branch}'
 
     scm:
         - git:
             url: '$GIT_BASE'
             refspec: ''
             branches:
-                - 'origin/master'
+                - 'origin/{branch}'
             skip-tag: true
             recursive-submodules: true
 
     wrappers:
         - autorelease-build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H 0 * * *'
         global-settings: '{odl-global-settings}'
 
     postbuilders:
-        - maven-target:
+        - autorelease-maven-sources:
+            maven-version: '{mvn32}'
+            settings: '{autorelease-settings}'
+            global-settings: '{odl-global-settings}'
+        - jacoco-nojava-workaround
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'sources.log,patches/*.patch'
+        - email-notification:
+            email-prefix: '[autorelease]'
+
+- job-template:
+    name: 'autorelease-release-lithium'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - autorelease-release-tag:
+            release-tag: 'Pre-Lithium'
+        - autorelease-release-branch:
+            release-branch: '{branch}'
+
+    scm:
+        - git:
+            credentials-id: '{ssh-credentials}'
+            url: '$GIT_BASE'
+            refspec: ''
+            branches:
+                - 'origin/{branch}'
+            skip-tag: true
+            recursive-submodules: true
+
+    wrappers:
+        - autorelease-build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    prebuilders:
+        - shell:
+            !include-raw include-raw-autorelease-release-versions.sh
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install source:jar javadoc:jar -Pintegrationtests,docs,repoBuild -fae -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        settings: '{autorelease-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - autorelease-cfp:
+            autorelease-settings: '{autorelease-settings}'
+            odl-global-settings: '{odl-global-settings}'
+        - autorelease-maven-deploy
+        - autorelease-maven-sources:
             maven-version: '{mvn32}'
-            pom: 'pom.xml'
-            goals: 'dependency:sources -l sources.log -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            java-opts:
-                - '-Xmx4096m -XX:MaxPermSize=1024m'
             settings: '{autorelease-settings}'
             global-settings: '{odl-global-settings}'
         - jacoco-nojava-workaround
 
     publishers:
         - archive-artifacts:
-            artifacts: 'sources.log'
+            artifacts: 'sources.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'
index 7e193f7821f12b6cee6657b27a6d8b4b9d79b71d..db61e47b0a85459a1e5a4c21ed57a0e7b7b5cbd8 100644 (file)
@@ -7,6 +7,14 @@
             default: '{release-tag}'
             description: "The Release train tag to use eg. Helium-SR3"
 
+- parameter:
+    name: autorelease-release-branch
+    parameters:
+        - string:
+            name: RELEASE_BRANCH
+            default: '{release-branch}'
+            description: "The Release train branch to base build off eg. stable/helium"
+
 - wrapper:
     name: autorelease-build-timeout
     wrappers:
             type: absolute
             timeout: 360
             fail: true
+
+- builder:
+    name: autorelease-cfp
+    builders:
+        - config-file-provider:
+            files:
+                - file-id: '{autorelease-settings}'
+                  variable: 'AUTORELEASE_SETTINGS'
+                - file-id: '{odl-global-settings}'
+                  variable: 'ODL_GLOBAL_SETTINGS'
+
+- builder:
+    name: autorelease-maven-deploy
+    builders:
+        - shell: |
+            mkdir -p hide/from/pom/files
+            cd hide/from/pom/files
+            mkdir -p m2repo/org/
+            mv /tmp/r/org/opendaylight m2repo/org/
+            mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-repository -DrepositoryDirectory="`pwd`/m2repo" -DnexusUrl=http://nexus.opendaylight.org/ -DstagingProfileId="21a27b7f3bbb8d" -DserverId="opendaylight.weekly" -s $AUTORELEASE_SETTINGS -gs $ODL_GLOBAL_SETTINGS
+
+- builder:
+    name: autorelease-maven-sources
+    builders:
+        - maven-target:
+            maven-version: '{maven-version}'
+            pom: 'pom.xml'
+            goals: 'dependency:sources -l sources.log -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+                - '-Xmx4096m -XX:MaxPermSize=1024m'
+            settings: '{settings}'
+            global-settings: '{global-settings}'
diff --git a/jjb/autorelease/autorelease-master.yaml b/jjb/autorelease/autorelease-master.yaml
new file mode 100644 (file)
index 0000000..1526592
--- /dev/null
@@ -0,0 +1,75 @@
+# Lithium build jobs
+
+- project:
+    name: autorelease-master
+    jobs:
+        - 'autorelease-daily-master'
+
+    branch: 'master'
+    project: 'releng/autorelease'
+    jdk: 'openjdk7'
+
+- job-template:
+    name: 'autorelease-daily-master'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - autorelease-release-tag:
+            release-tag: 'Daily'
+        - autorelease-release-branch:
+            release-branch: '{branch}'
+
+    scm:
+        - git:
+            credentials-id: '{ssh-credentials}'
+            url: '$GIT_BASE'
+            refspec: ''
+            branches:
+                - 'origin/{branch}'
+            skip-tag: true
+            recursive-submodules: true
+
+    wrappers:
+        - autorelease-build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H 0 * * *'
+
+    prebuilders:
+        - shell:
+            !include-raw-escape include-raw-autorelease-release-versions.sh
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install source:jar javadoc:jar -Pintegrationtests,docs,repoBuild -fae -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        settings: '{autorelease-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - autorelease-maven-sources:
+            maven-version: '{mvn32}'
+            settings: '{autorelease-settings}'
+            global-settings: '{odl-global-settings}'
+        - jacoco-nojava-workaround
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'sources.log,patches/*.patch'
+        - email-notification:
+            email-prefix: '[autorelease]'
index b61248407a37542028b41effd2e5ad098e285c58..bef3204c0d569090a7b3c687494871d6b72e42c5 100644 (file)
 ##############################################################################
 
 # RELEASE_TAG=Helium-SR2  # Example
+# RELEASE_BRANCH=stable/helium  # Example
 
 ./scripts/version.sh release $RELEASE_TAG
 git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
-git submodule foreach "git format-patch --stdout origin/master > ../patches/${PWD##*/}.patch"
+
+mkdir patches
+git submodule foreach 'git format-patch --stdout origin/$RELEASE_BRANCH > ../patches/$name.patch'
 
 ./scripts/fix-relativepaths.sh
index ac8d0d117807afe628091c00b743393fd78caa2d..894f5ef5eebd2ef62c5d9b3ea54a971d244d98ed 100644 (file)
@@ -49,7 +49,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit:
index e7ab7ccc608e0d7552be910d71101ff6ed3848a0..291e8d59919c261e2eb3851097c11e57b57ac9f4 100644 (file)
@@ -11,6 +11,7 @@
         - 'bgpcep-daily-{stream}'
         - 'bgpcep-integration-{stream}'
         - 'bgpcep-sonar'
+        - 'bgpcep-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -78,7 +79,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[bgpcep]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[bgpcep]'
         - jacoco-report
 
+- job-template:
+    name: 'bgpcep-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{bgpcep-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: bgpcep
+
+    publishers:
+        - email-notification:
+            email-prefix: '[bgpcep]'
+
index 102c4860209567774a07f07ddd9a80c3b9d088c5..5b1ea829041f996dc49bee5347a3ac483d68a0e1 100644 (file)
@@ -11,6 +11,7 @@
         - 'capwap-daily-{stream}'
         - 'capwap-integration-{stream}'
         - 'capwap-sonar'
+        - 'capwap-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[capwap]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[capwap]'
         - jacoco-report
 
+- job-template:
+    name: 'capwap-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{capwap-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: capwap
+
+    publishers:
+        - email-notification:
+            email-prefix: '[capwap]'
+
index 665ba365e649020c9b30aea38de5a70f8fe7dccf..105f31e6250423f1c665487671f20e76cf7c0a85 100644 (file)
@@ -2,3 +2,4 @@ BRANCHES: master,stable/helium,stable/lithium
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs
 MVN_OPTS: -Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true
 DEPENDENCIES: yangtools,aaa
+JDKS: openjdk7,openjdk8
index 715009bb6846cc3b6f55a69e12e170dc92139d4a..46f70ab683dbfc655e401e9dbffa2bf62f3dc825 100644 (file)
@@ -11,6 +11,7 @@
         - 'controller-daily-{stream}'
         - 'controller-integration-{stream}'
         - 'controller-sonar'
+        - 'controller-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -54,6 +55,7 @@
             type: jdk
             values:
                 - openjdk7
+                - openjdk8
 
 
     logrotate:
@@ -77,7 +79,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[controller]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[controller]'
         - jacoco-report
 
+- job-template:
+    name: 'controller-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{controller-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: controller
+
+    publishers:
+        - email-notification:
+            email-prefix: '[controller]'
+
index 800a886a9a1d10990d559bae351179c812abd534..443140afe9402e656206f5a946d875bc444d32ed 100644 (file)
@@ -11,6 +11,7 @@
         - 'coretutorials-daily-{stream}'
         - 'coretutorials-integration-{stream}'
         - 'coretutorials-sonar'
+        - 'coretutorials-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[coretutorials]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[coretutorials]'
         - jacoco-report
 
+- job-template:
+    name: 'coretutorials-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{coretutorials-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: coretutorials
+
+    publishers:
+        - email-notification:
+            email-prefix: '[coretutorials]'
+
index b48281fe0234a6fca3b2b4aed147fc811faeeac5..0bd4e5df74c4a9d78d8050da4c4babb625602aac 100644 (file)
@@ -11,6 +11,7 @@
         - 'defense4all-daily-{stream}'
         - 'defense4all-integration-{stream}'
         - 'defense4all-sonar'
+        - 'defense4all-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[defense4all]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[defense4all]'
         - jacoco-report
 
+- job-template:
+    name: 'defense4all-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{defense4all-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: defense4all
+
+    publishers:
+        - email-notification:
+            email-prefix: '[defense4all]'
+
index 1dd91abc2f6fada92ecc52ece8ef543941a417f2..d5952ff396c9c32b051f1518ffb4e1bc9288fa71 100644 (file)
@@ -11,6 +11,7 @@
         - 'didm-daily-{stream}'
         - 'didm-integration-{stream}'
         - 'didm-sonar'
+        - 'didm-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[didm]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[didm]'
         - jacoco-report
 
+- job-template:
+    name: 'didm-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{didm-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: didm
+
+    publishers:
+        - email-notification:
+            email-prefix: '[didm]'
+
index 77b3793424a32d9ff82c36222c7ca1c28b714032..3ec848e09dde18d9bedbe347dd1bf948bd1eb56e 100644 (file)
@@ -11,6 +11,7 @@
         - 'discovery-daily-{stream}'
         - 'discovery-integration-{stream}'
         - 'discovery-sonar'
+        - 'discovery-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[discovery]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[discovery]'
         - jacoco-report
 
+- job-template:
+    name: 'discovery-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{discovery-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: discovery
+
+    publishers:
+        - email-notification:
+            email-prefix: '[discovery]'
+
index d33e6efa4ad2203375775a44b5c15b004178a2cf..bb7a1bff9fc92d5e58c9441d162c789cd69fd15f 100644 (file)
@@ -11,6 +11,7 @@
         - 'dlux-daily-{stream}'
         - 'dlux-integration-{stream}'
         - 'dlux-sonar'
+        - 'dlux-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[dlux]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[dlux]'
         - jacoco-report
 
+- job-template:
+    name: 'dlux-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{dlux-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: dlux
+
+    publishers:
+        - email-notification:
+            email-prefix: '[dlux]'
+
index 61697ff9cfc7146fb535117e7104c921a7d2ca02..ad1692a8b7dd10f016cf85ba2999fd7135acf7b7 100644 (file)
@@ -11,6 +11,7 @@
         - 'docs-daily-{stream}'
         - 'docs-integration-{stream}'
         - 'docs-sonar'
+        - 'docs-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[docs]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[docs]'
         - jacoco-report
 
+- job-template:
+    name: 'docs-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{docs-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: docs
+
+    publishers:
+        - email-notification:
+            email-prefix: '[docs]'
+
index 25f504d251afb19e4844ec9543aca7665970515d..773c4f66e102e011b218576254e45a1be2ec2605 100644 (file)
@@ -11,6 +11,7 @@
         - 'groupbasedpolicy-daily-{stream}'
         - 'groupbasedpolicy-integration-{stream}'
         - 'groupbasedpolicy-sonar'
+        - 'groupbasedpolicy-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[groupbasedpolicy]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[groupbasedpolicy]'
         - jacoco-report
 
+- job-template:
+    name: 'groupbasedpolicy-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{groupbasedpolicy-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: groupbasedpolicy
+
+    publishers:
+        - email-notification:
+            email-prefix: '[groupbasedpolicy]'
+
index 0848d0376c500d473f659b1b215d4c9a5a3f2313..e5ff0e759060212145f2b51088279d09a26b97dc 100644 (file)
@@ -67,7 +67,7 @@ echo "sleeping for 20 seconds..."
 sleep 20
 
 echo "Check OSGi bundles..."
-./client "feature:install ${CONTROLLERFEATURES}" || echo $? > ${WORKSPACE}/error.txt
+sshpass -p karaf ./client -u karaf "feature:install ${CONTROLLERFEATURES}" || echo $? > ${WORKSPACE}/error.txt
 
 echo "Fetching Karaf log"
 cd ${WORKSPACE}
index 9210b45be3f25b5590e080fcef6f75326bd5cfa6..73d8233d764c61cee38e5b1606fb33d3baba1bc1 100644 (file)
@@ -88,7 +88,7 @@ echo "Cool down for 1 min :)..."
 sleep 60
 
 echo "Checking OSGi bundles..."
-./client 'bundle:list'
+sshpass -p karaf ./client -u karaf 'bundle:list'
 
 EOF
 
index 93093df1394688f2a124458dde4573854efc3e58..bba19dc85018e87b97eac9090eeac272bced7660 100644 (file)
@@ -65,7 +65,8 @@
             controller-vms: 1
             mininet-vms: 1
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - integration-csit-gerrit-trigger-patch-submitted:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - integration-distribution-gerrit-trigger-patch-submitted:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - integration-distribution-gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     parameters:
         - project-parameter:
             project: 'integration'
-        - integration-patch-git:
-            patch-git: ''
-        - integration-patch-refspec:
-            patch-refspec: ''
-        - integration-patch-git-url:
-            patch-git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/$PATCHGIT'
+        - integration-patch-git-url
 
     scm:
         - integration-gerrit-scm:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'test-integration'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '**'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
 
     prebuilders:
         - integration-get-bundle-url
         - wipe-org-opendaylight-repo
         - maven-target:
             maven-version: '{mvn32}'
-            pom: '$PATCHGIT/pom.xml'
+            pom: '$GERRIT_PROJECT/pom.xml'
             goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
index ab6fe55f10669f5b24f9eba03b8fb0aed1eb597e..bbf9fe7992e983f9ddafc594aba1b8520ba2f69f 100644 (file)
             default: '{test-options}'
             description:  'Robot command options'
 
-- parameter:
-    name: integration-patch-git
-    parameters:
-        - string:
-            name: PATCHGIT
-            default: '{patch-git}'
-            description:  'Patch GIT repository'
-
 - parameter:
     name: integration-patch-git-url
     parameters:
         - string:
             name: PATCHGITURL
-            default: '{patch-git-url}'
+            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/$GERRIT_PROJECT'
             description:  'Patch GIT URL (do not modify)'
 
-- parameter:
-    name: integration-patch-refspec
-    parameters:
-        - string:
-            name: PATCHREFSPEC
-            default: '{patch-refspec}'
-            description:  'Patch Refspec'
-
 - scm:
     name: integration-gerrit-scm
     scm:
         - git:
             credentials-id: '{credentials-id}'
             url: '$PATCHGITURL'
-            basedir: '$PATCHGIT'
-            refspec: '$PATCHREFSPEC'
+            basedir: '$GERRIT_PROJECT'
+            refspec: '$GERRIT_REFSPEC'
             branches:
                 - 'origin/{branch}'
             skip-tag: true
index da08b5a068ba4d61d2fa252eb3dfadb684caaf04..2918a15504fc02e52fad8bf62cf7a774f3682a27 100644 (file)
@@ -49,7 +49,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit:
index e9ee4f793f441f0cb933df98f79c7bca93f24811..464c2c127d43cb19425296d41ad846d12fb3ff4e 100644 (file)
@@ -24,7 +24,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
@@ -90,7 +91,8 @@
             controller-vms: 1
             mininet-vms: 1
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - integration-test-gerrit-trigger-patch-submitted:
             controller-vms: 1
             mininet-vms: 1
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
             controller-vms: 1
             mininet-vms: 1
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
diff --git a/jjb/integration/openflowplugin-csit-scalability-master.yaml b/jjb/integration/openflowplugin-csit-scalability-master.yaml
new file mode 100644 (file)
index 0000000..b29e826
--- /dev/null
@@ -0,0 +1,32 @@
+- project:
+    name: openflowplugin-csit-scalability-master
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'scalability'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui'
+
+    # Robot custom options
+    robot-options: '-v TOPO_TREE_DEPTH:5 -e adsal'
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+
index 0c2903b0971b64b9e62a633d83075df5c92afcc5..ec5933ccc28edcd650bea40d00ea516d50ed42c9 100644 (file)
@@ -1,2 +1,3 @@
 BRANCHES: master
-DEPENDENCIES: controller,yangtools,odlparent,aaa
\ No newline at end of file
+DEPENDENCIES: controller,yangtools,odlparent,aaa
+JDKS: openjdk7,openjdk8
index 0dd76c5357765bab871af4639021c40bef8e5a9a..f2a24a86463b872e8d2421991e9b2f5628b58e91 100644 (file)
@@ -11,6 +11,7 @@
         - 'iotdm-daily-{stream}'
         - 'iotdm-integration-{stream}'
         - 'iotdm-sonar'
+        - 'iotdm-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -52,6 +53,7 @@
             type: jdk
             values:
                 - openjdk7
+                - openjdk8
 
 
     logrotate:
@@ -75,7 +77,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +98,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[iotdm]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[iotdm]'
         - jacoco-report
 
+- job-template:
+    name: 'iotdm-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{iotdm-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: iotdm
+
+    publishers:
+        - email-notification:
+            email-prefix: '[iotdm]'
+
diff --git a/jjb/l2switch/l2switch-csit-scalability-master.yaml b/jjb/l2switch/l2switch-csit-scalability-master.yaml
new file mode 100644 (file)
index 0000000..d707e1a
--- /dev/null
@@ -0,0 +1,32 @@
+- project:
+    name: l2switch-csit-scalability-master
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'l2switch'
+
+    # The functionality under test
+    functionality: 'scalability'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-l2switch-switch-ui'
+
+    # Robot custom options
+    robot-options: '-v TOPO_TREE_DEPTH:5'
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},l2switch-distribution-{stream}'
+
index a8d611ff7c40f1b3db2b3d4fb14e4ce9a74ff43b..1cd6159fa23718f8fb84f3dcdfa565798b44278a 100644 (file)
@@ -11,6 +11,7 @@
         - 'l2switch-daily-{stream}'
         - 'l2switch-integration-{stream}'
         - 'l2switch-sonar'
+        - 'l2switch-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[l2switch]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[l2switch]'
         - jacoco-report
 
+- job-template:
+    name: 'l2switch-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{l2switch-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: l2switch
+
+    publishers:
+        - email-notification:
+            email-prefix: '[l2switch]'
+
index 1fc687e004af78272e4680ec901186eecf320bc6..f98765a9fa3547b9c1c3aee7528aae5f29f84387 100644 (file)
@@ -11,6 +11,7 @@
         - 'lacp-daily-{stream}'
         - 'lacp-integration-{stream}'
         - 'lacp-sonar'
+        - 'lacp-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[lacp]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[lacp]'
         - jacoco-report
 
+- job-template:
+    name: 'lacp-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{lacp-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: lacp
+
+    publishers:
+        - email-notification:
+            email-prefix: '[lacp]'
+
index bdcf935d5065f9c3345c7b754fde807c7ad9a7c8..4f85cd00690c9d9c026b5b6a5a4f7391f5637eba 100644 (file)
@@ -11,6 +11,7 @@
         - 'lispflowmapping-daily-{stream}'
         - 'lispflowmapping-integration-{stream}'
         - 'lispflowmapping-sonar'
+        - 'lispflowmapping-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[lispflowmapping]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[lispflowmapping]'
         - jacoco-report
 
+- job-template:
+    name: 'lispflowmapping-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{lispflowmapping-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: lispflowmapping
+
+    publishers:
+        - email-notification:
+            email-prefix: '[lispflowmapping]'
+
diff --git a/jjb/neutron/include-raw-openstack-ci.sh b/jjb/neutron/include-raw-openstack-ci.sh
new file mode 100644 (file)
index 0000000..272149f
--- /dev/null
@@ -0,0 +1,157 @@
+#!/bin/bash
+#
+# NOTE: This file takes two jobs from the OpenStack infra and
+#       puts them here. See here:
+#
+# https://github.com/openstack-infra/project-config/blob/master/jenkins/jobs/networking-odl.yaml
+
+export PATH=$PATH:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
+
+# *SIGH*. This is required to get lsb_release
+sudo yum -y install redhat-lsb-core indent python-testrepository
+
+echo "Making /opt/stack/new jenkins:jenkins"
+sudo /usr/sbin/groupadd jenkins
+sudo mkdir -p /opt/stack/new
+sudo chown -R jenkins:jenkins /opt/stack/new
+sudo bash -c 'echo "stack ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers'
+
+# We need to install some scripts from openstack-infra/project-config
+cd ~
+echo "Setting up infra scripts"
+sudo mkdir -p /usr/local/jenkins/slave_scripts
+git clone https://git.openstack.org/openstack-infra/project-config
+cd project-config
+sudo cp jenkins/scripts/subunit2html.py /usr/local/jenkins/slave_scripts
+
+# Save existing WORKSPACE
+SAVED_WORKSPACE=$WORKSPACE
+export WORKSPACE=~/workspace
+mkdir -p $WORKSPACE
+cd $WORKSPACE
+
+# This is the job which checks out devstack-gate
+if [[ ! -e devstack-gate ]]; then
+    echo "Cloning devstack-gate"
+    git clone https://git.openstack.org/openstack-infra/devstack-gate
+else
+    echo "Fixing devstack-gate git remotes"
+    cd devstack-gate
+    git remote set-url origin https://git.openstack.org/openstack-infra/devstack-gate
+    git remote update
+    git reset --hard
+    if ! git clean -x -f ; then
+        sleep 1
+        git clean -x -f
+    fi
+    git checkout master
+    git reset --hard remotes/origin/master
+    if ! git clean -x -f ; then
+        sleep 1
+        git clean -x -f
+    fi
+    cd ..
+fi
+
+# Set the pieces we want to test
+if [ "$GERRIT_PROJECT" == "openstack/neutron" ]; then
+    ZUUL_PROJECT=$GERRIT_PROJECT
+    ZUUL_BRANCH=$GERRIT_REFSPEC
+elif [ "$GERRIT_PROJECT" == "openstack-dev/devstack" ]; then
+    ZUUL_PROJECT=$GERRIT_PROJECT
+    ZUUL_BRANCH=$GERRIT_REFSPEC
+fi
+
+echo "Setting environment variables"
+
+# Enable ODL debug logs and set memory parameters
+DEVSTACK_LOCAL_CONFIG=""
+DEVSTACK_LOCAL_CONFIG+="ODL_NETVIRT_DEBUG_LOGS=True;"
+DEVSTACK_LOCAL_CONFIG+="ODL_JAVA_MIN_MEM=512m;"
+DEVSTACK_LOCAL_CONFIG+="ODL_JAVA_MAX_MEM=784m;"
+DEVSTACK_LOCAL_CONFIG+="ODL_JAVA_MAX_PERM_MEM=784m;"
+
+# Set ODL_URL_PREFIX if "nexus proxy" is provided
+URL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
+if [ -n "$ODLNEXUSPROXY" ] ; then
+    DEVSTACK_LOCAL_CONFIG+="ODL_URL_PREFIX=$ODLNEXUSPROXY;"
+fi
+
+## # Trim down the boot wait time
+## export ODL_BOOT_WAIT=30
+
+# Use Lithium build, if asked to do so
+if [ "${ODL_VERSION}" == "lithium-latest" ] ; then
+    NEXUSPATH="${URL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
+    BUNDLEVERSION='0.3.0-SNAPSHOT'
+
+    # Acquire the timestamp information from maven-metadata.xml
+    wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
+    BUNDLE_TIMESTAMP=`xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null`
+    echo "Nexus timestamp is ${BUNDLE_TIMESTAMP}"
+
+    DEVSTACK_LOCAL_CONFIG+="ODL_NAME=distribution-karaf-${BUNDLEVERSION};"
+    DEVSTACK_LOCAL_CONFIG+="ODL_PKG=distribution-karaf-${BUNDLE_TIMESTAMP}.zip;"
+    DEVSTACK_LOCAL_CONFIG+="ODL_URL=${NEXUSPATH}/${BUNDLEVERSION};"
+fi
+
+# If Karaf netvirt feature was explicitly provided, add it to DEVSTACK_LOCAL_CONFIG
+if [ -n "$KARAFFEATURE" ] ; then
+    DEVSTACK_LOCAL_CONFIG+="ODL_NETVIRT_KARAF_FEATURE=${KARAFFEATURE};"
+fi
+
+# And this runs devstack-gate
+export PYTHONUNBUFFERED=true
+export DEVSTACK_GATE_TIMEOUT=120
+export DEVSTACK_GATE_NEUTRON=1
+export DEVSTACK_GATE_TEMPEST=1
+export BRANCH_OVERRIDE=master
+if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+    export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+fi
+# Because we are testing a non standard project, add
+# our project repository. This makes zuul do the right
+# reference magic for testing changes.
+export PROJECTS="stackforge/networking-odl $PROJECTS"
+# Note the actual url here is somewhat irrelevant because it
+# caches in nodepool, however make it a valid url for
+# documentation purposes.
+if [ "$GERRIT_PROJECT" == "stackforge/networking-odl" ]; then
+    export DEVSTACK_LOCAL_CONFIG+="enable_plugin networking-odl https://$GERRIT_HOST/$GERRIT_PROJECT $GERRIT_REFSPEC"
+else
+    export DEVSTACK_LOCAL_CONFIG+="enable_plugin networking-odl https://git.openstack.org/stackforge/networking-odl"
+fi
+
+
+# Keep localrc to be able to set some vars in pre_test_hook
+export KEEP_LOCALRC=1
+
+# Unset this because it's set by the underlying Jenkins node ...
+unset GIT_BASE
+
+# By default, only run certain tempest tests
+export DEVSTACK_GATE_TEMPEST_REGEX=${TEMPEST_REGEX:-"tempest.api.network.test_networks_negative tempest.api.network.test_networks.NetworksTestJSON"}
+
+# Specifically set the services we want
+#OVERRIDE_ENABLED_SERVICES=q-svc,q-dhcp,q-l3,q-meta,quantum,key,g-api,g-reg,n-api,n-crt,n-obj,n-cpu,n-cond,n-sch,n-xvnc,n-cauth,h-eng,h-api,h-api-cfn,h-api-cw,rabbit,tempest,mysql
+
+echo "Copying devstack-vm-gate-wrap.sh"
+cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+echo "Running safe-devstack-vm-gate-wrap.sh"
+./safe-devstack-vm-gate-wrap.sh
+# Save the return value so we can exit with this
+DGRET=$?
+
+# Restore WORKSPACE
+OS_WORKSPACE=$WORKSPACE
+export WORKSPACE=$SAVED_WORKSPACE
+
+# Copy all the logs
+cp -r $OS_WORKSPACE/logs $WORKSPACE
+cp -a /opt/stack/new/logs/q-odl-karaf* $WORKSPACE/logs
+mkdir -p $WORKSPACE/logs/opendaylight
+cp -a /opt/stack/new/opendaylight/distribution*/etc $WORKSPACE/logs/opendaylight
+# Unzip the logs to make them easier to view
+gunzip $WORKSPACE/logs/*.gz
+
+exit $DGRET
diff --git a/jjb/neutron/neutron-daily-openstack-master.yaml b/jjb/neutron/neutron-daily-openstack-master.yaml
new file mode 100644 (file)
index 0000000..59742de
--- /dev/null
@@ -0,0 +1,56 @@
+- project:
+    name: neutron-daily-openstack
+    jobs:
+        - 'neutron-daily-openstack-master'
+
+    project: 'neutron'
+
+- job-template:
+    name: 'neutron-daily-openstack-master'
+
+    project-type: freestyle
+    node: dynamic_devstack
+    description: 'Jenkins job to run Tempest tests for the ODL ML2 MechanismDriver on Neutron dummy provider. '
+    concurrent: true
+
+    logrotate:
+        daysToKeep: '198'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    wrappers:
+        - timeout:
+            fail: true
+            timeout: 90
+            timeout-var: 'BUILD_TIMEOUT'
+            type: absolute
+        - ssh-agent-credentials:
+            users:
+                - '{openstack-gerrit-credentials}'
+        - jclouds:
+            single-use: true
+
+    triggers:
+        - timed: '@daily'
+
+    builders:
+        - inject:
+            properties-content: |
+              ODL_VERSION=lithium-latest
+              TEMPEST_REGEX=tempest.api.network
+              KARAFFEATURE=odl-neutron-dummyprovider-test
+        - shell:
+            !include-raw-escape include-raw-openstack-ci.sh
+
+    publishers:
+        - archive:
+            artifacts: 'logs/**'
+            fingerprint: false
+        - email-ext:
+            subject: '[neutron] $DEFAULT_SUBJECT'
+            attach-build-log: false
+            failure: false
+            unstable: false
+            fixed: false
index 7d23d1b74c9f3f687525fe1344959c71326cb7a2..c2da570fd9de18a18f7c42447df41ef06f3a0e2d 100644 (file)
@@ -11,6 +11,7 @@
         - 'neutron-daily-{stream}'
         - 'neutron-integration-{stream}'
         - 'neutron-sonar'
+        - 'neutron-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[neutron]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[neutron]'
         - jacoco-report
 
+- job-template:
+    name: 'neutron-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{neutron-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: neutron
+
+    publishers:
+        - email-notification:
+            email-prefix: '[neutron]'
+
index e7cfa26209bb42dc3dd3629b45074853034bab72..850fac753cf5086d4c59d62a87ca342568589e5a 100644 (file)
@@ -11,6 +11,7 @@
         - 'nic-daily-{stream}'
         - 'nic-integration-{stream}'
         - 'nic-sonar'
+        - 'nic-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[nic]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[nic]'
         - jacoco-report
 
+- job-template:
+    name: 'nic-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{nic-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: nic
+
+    publishers:
+        - email-notification:
+            email-prefix: '[nic]'
+
diff --git a/jjb/odlparent/odlparent.cfg b/jjb/odlparent/odlparent.cfg
new file mode 100644 (file)
index 0000000..51d8795
--- /dev/null
@@ -0,0 +1 @@
+BRANCHES: master,stable/helium,stable/lithium
index b4a3ce215c7aaf33235a8474203241e70540671b..c40485ebfa5e782f425e680e896863f267ae8478 100644 (file)
@@ -11,6 +11,7 @@
         - 'odlparent-daily-{stream}'
         - 'odlparent-integration-{stream}'
         - 'odlparent-sonar'
+        - 'odlparent-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -20,6 +21,8 @@
             branch: 'master'
         - stable-helium:
             branch: 'stable/helium'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     project: 'odlparent'
     jdk: 'openjdk7'
@@ -77,7 +80,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[odlparent]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[odlparent]'
         - jacoco-report
 
+- job-template:
+    name: 'odlparent-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{odlparent-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: odlparent
+
+    publishers:
+        - email-notification:
+            email-prefix: '[odlparent]'
+
index a34e6d6efdabc52d1f59f437d580d21c6e59ccdf..414ec326fe8f447e15f9c0c8ff6cc827c9a0dd75 100644 (file)
@@ -11,6 +11,7 @@
         - 'openflowjava-daily-{stream}'
         - 'openflowjava-integration-{stream}'
         - 'openflowjava-sonar'
+        - 'openflowjava-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -78,7 +79,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[openflowjava]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[openflowjava]'
         - jacoco-report
 
+- job-template:
+    name: 'openflowjava-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{openflowjava-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: openflowjava
+
+    publishers:
+        - email-notification:
+            email-prefix: '[openflowjava]'
+
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-master.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-master.yaml
new file mode 100644 (file)
index 0000000..b5413c7
--- /dev/null
@@ -0,0 +1,41 @@
+- project:
+    name: openflowplugin-csit-cbench-daily-master
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'cbench-daily'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-drop-test'
+
+    # Robot custom options
+    robot-options: '-v duration_in_secs:180'
+
+    # Trigger jobs (daily)
+    triggers:
+        - timed: '@daily'
+
+    trigger-jobs: ''
+
+    # Plot Info
+    01-plot-title: 'Throughput Mode'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'Cbench Performance'
+    01-plot-data-file: 'throughput.csv'
+    02-plot-title: 'Latency Mode'
+    02-plot-yaxis: 'flow_mods/sec'
+    02-plot-group: 'Cbench Performance'
+    02-plot-data-file: 'latency.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-master.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-master.yaml
new file mode 100644 (file)
index 0000000..97629e6
--- /dev/null
@@ -0,0 +1,34 @@
+- project:
+    name: openflowplugin-csit-config-performance-master
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'config-performance'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+
+    # Plot Info
+    01-plot-title: 'Config Rest Api Rate'
+    01-plot-yaxis: 'http_req/sec'
+    01-plot-group: 'Config Performance'
+    01-plot-data-file: 'rates.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
new file mode 100644 (file)
index 0000000..2800f26
--- /dev/null
@@ -0,0 +1,28 @@
+- project:
+    name: openflowplugin-csit-flow-services-lithium-redesign
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'flow-services-lithium-redesign'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-app-new-lldp-speaker'
+
+    # Robot custom options
+    robot-options: '-v TOPO_TREE_DEPTH:5 -e adsal'
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
index 07e26c52dab083254edbccdbdf59924497105167..cc16d591b1e8a2d7677c458dbe28a6cb19fa68e4 100644 (file)
@@ -22,7 +22,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-adsal-compatibility,odl-nsf-all'
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-nsf-all'
 
     # Robot custom options
     robot-options: '-v TOPO_TREE_DEPTH:5 -e adsal'
index 7ce0bc83c6a11f419b082568757aa762432c355c..27bcd728daaf26c86c9cee70c82e8d31a4b04892 100644 (file)
@@ -2,3 +2,4 @@ MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tm
 #MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
 DEPENDENCIES: yangtools,controller,openflowjava
 ARCHIVE_ARTIFACTS: model/*/target/site/**
+JDKS: openjdk7,openjdk8
index 129f00eb37173f19dc7aed7baa6fda8b5ac457ef..ef1983468f17e01b38e3ba8553f03dd041240319 100644 (file)
@@ -11,6 +11,7 @@
         - 'openflowplugin-daily-{stream}'
         - 'openflowplugin-integration-{stream}'
         - 'openflowplugin-sonar'
+        - 'openflowplugin-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -54,6 +55,7 @@
             type: jdk
             values:
                 - openjdk7
+                - openjdk8
 
 
     logrotate:
@@ -77,7 +79,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[openflowplugin]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[openflowplugin]'
         - jacoco-report
 
+- job-template:
+    name: 'openflowplugin-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{openflowplugin-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: openflowplugin
+
+    publishers:
+        - email-notification:
+            email-prefix: '[openflowplugin]'
+
index 5d5d7c7ca933f5f06e117dad7819d749e09de679..c269b02bc5d32473611123e3106622b3daee7122 100644 (file)
@@ -32,7 +32,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
index e9febf1ad6528b00f4d769ad1f1e0c9c2ce5c1f2..bdceea0caa8ee9ea20018475573036b22c1b0692 100644 (file)
@@ -27,7 +27,8 @@
             timeout-var: 'BUILD_TIMEOUT'
             type: absolute
         - ssh-agent-credentials:
-            user: '{openstack-gerrit-credentials}'
+            users:
+                - '{openstack-gerrit-credentials}'
         - jclouds:
             single-use: true
 
index ad311913fb8e2cfb50df775e89fa914e2cc76b36..8bac0764a707880e3e67f80ebe834724d837921a 100644 (file)
@@ -68,7 +68,8 @@
             timeout-var: 'BUILD_TIMEOUT'
             type: absolute
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: '@midnight'
index 01a079675e1f2d94626ca0a6e61071479b92bf24..b381f145170b39ade5daa435c8c2b801af7fc506 100644 (file)
@@ -27,7 +27,8 @@
             timeout-var: 'BUILD_TIMEOUT'
             type: absolute
         - ssh-agent-credentials:
-            user: '{openstack-gerrit-credentials}'
+            users:
+                - '{openstack-gerrit-credentials}'
         - jclouds:
             single-use: true
 
index e0d69bf0db67389e5e8409928be44fe280776444..16fc9d71e61275a0c2418803a6869fc33522c4c5 100644 (file)
@@ -10,6 +10,7 @@
         - 'ovsdb-merge-{stream}'
         - 'ovsdb-daily-{stream}'
         - 'ovsdb-integration-{stream}'
+        - 'ovsdb-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -76,7 +77,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -96,6 +98,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[ovsdb]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
             email-prefix: '[ovsdb] [odlparent] [controller] [yangtools] [openflowplugin] [neutron]'
         - jacoco-report
 
+- job-template:
+    name: 'ovsdb-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{ovsdb-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: ovsdb
+
+    publishers:
+        - email-notification:
+            email-prefix: '[ovsdb]'
+
index 6f8470c2a2c28bf92308d36c276115195f7de3b5..ffdf228cb205c9776b3a4862f69891b80df3039b 100644 (file)
@@ -11,6 +11,7 @@
         - 'packetcable-daily-{stream}'
         - 'packetcable-integration-{stream}'
         - 'packetcable-sonar'
+        - 'packetcable-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[packetcable]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[packetcable]'
         - jacoco-report
 
+- job-template:
+    name: 'packetcable-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{packetcable-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: packetcable
+
+    publishers:
+        - email-notification:
+            email-prefix: '[packetcable]'
+
index 44502815a58b01e933218fe29220fd0fa4caa468..3fefe13d0bc9e2646863e591427228fcf530a3d7 100644 (file)
@@ -11,6 +11,7 @@
         - 'persistence-daily-{stream}'
         - 'persistence-integration-{stream}'
         - 'persistence-sonar'
+        - 'persistence-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[persistence]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[persistence]'
         - jacoco-report
 
+- job-template:
+    name: 'persistence-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{persistence-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: persistence
+
+    publishers:
+        - email-notification:
+            email-prefix: '[persistence]'
+
index 46976ce4c62454f4cd33383a0dadb7876d854bc8..f4a15ef17e1e8acbcddc5be20769b2744264e743 100644 (file)
@@ -34,7 +34,8 @@
 
     wrappers:
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit:
@@ -93,7 +94,8 @@
 
     wrappers:
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit:
 
     wrappers:
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit:
 
     wrappers:
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * 0'
 
     wrappers:
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * 1'
index e909bdb574dfa045f79ddb58db22e01b43f09f2c..516ceb05f11710586ea7518aa462dc8abe5889ad 100644 (file)
     name: jacoco-nojava-workaround
     builders:
         - shell: 'mkdir -p $WORKSPACE/target/classes'
+
+- builder:
+    name: check-clm
+    builders:
+        - sonatype-clm:
+            application-name: '{application-name}'
+            scan-targets: '**/target/**'
index b06f45000eeb2d3ef6a6e614c695f4bec74e9390..f2d0defacf5f440ea7a475547be8fa06a1d59e40 100644 (file)
@@ -11,6 +11,7 @@
         - 'reservation-daily-{stream}'
         - 'reservation-integration-{stream}'
         - 'reservation-sonar'
+        - 'reservation-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[reservation]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[reservation]'
         - jacoco-report
 
+- job-template:
+    name: 'reservation-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{reservation-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: reservation
+
+    publishers:
+        - email-notification:
+            email-prefix: '[reservation]'
+
index 2e4f2a03748cb167f5cb7cedf0523ef968646a34..f3b3ca0b45a825e8b8ac72c1321f84b452c23276 100644 (file)
@@ -11,6 +11,7 @@
         - 'sdninterfaceapp-daily-{stream}'
         - 'sdninterfaceapp-integration-{stream}'
         - 'sdninterfaceapp-sonar'
+        - 'sdninterfaceapp-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[sdninterfaceapp]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[sdninterfaceapp]'
         - jacoco-report
 
+- job-template:
+    name: 'sdninterfaceapp-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{sdninterfaceapp-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: sdninterfaceapp
+
+    publishers:
+        - email-notification:
+            email-prefix: '[sdninterfaceapp]'
+
index 483e81a79adbf6114180c859adcd75b58136f9d4..fd8f05a50d28f0ca26f0479b7ce96438f366822f 100644 (file)
@@ -49,7 +49,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit:
index 1f18f354b60c2d11fc71e71d2ae42b93f894a9b6..36e355fc9903625108436d42870abae69569b972 100644 (file)
@@ -11,6 +11,7 @@
         - 'sfc-daily-{stream}'
         - 'sfc-integration-{stream}'
         - 'sfc-sonar'
+        - 'sfc-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[sfc]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[sfc]'
         - jacoco-report
 
+- job-template:
+    name: 'sfc-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{sfc-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: sfc
+
+    publishers:
+        - email-notification:
+            email-prefix: '[sfc]'
+
index e912b73bed9500a056420f753f6816f8819d0d26..f8b56f001b7726c7dec8ea7f9f8ec4be4271db74 100644 (file)
@@ -11,6 +11,7 @@
         - 'snbi-daily-{stream}'
         - 'snbi-integration-{stream}'
         - 'snbi-sonar'
+        - 'snbi-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[snbi]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[snbi]'
         - jacoco-report
 
+- job-template:
+    name: 'snbi-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{snbi-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: snbi
+
+    publishers:
+        - email-notification:
+            email-prefix: '[snbi]'
+
index 1df3ab882997e9e576efaf2d4fe3c4ef0deb3912..3ea7c834504ab01d7b32f82d3802bade920fc9fc 100644 (file)
@@ -11,6 +11,7 @@
         - 'snmp-daily-{stream}'
         - 'snmp-integration-{stream}'
         - 'snmp-sonar'
+        - 'snmp-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[snmp]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[snmp]'
         - jacoco-report
 
+- job-template:
+    name: 'snmp-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{snmp-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: snmp
+
+    publishers:
+        - email-notification:
+            email-prefix: '[snmp]'
+
index 20c5f431a856605843eb19e9e35db50e24f7504f..192f27741afc52e103de190b203aa30dca484d06 100644 (file)
@@ -11,6 +11,7 @@
         - 'snmp4sdn-daily-{stream}'
         - 'snmp4sdn-integration-{stream}'
         - 'snmp4sdn-sonar'
+        - 'snmp4sdn-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[snmp4sdn]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[snmp4sdn]'
         - jacoco-report
 
+- job-template:
+    name: 'snmp4sdn-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{snmp4sdn-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: snmp4sdn
+
+    publishers:
+        - email-notification:
+            email-prefix: '[snmp4sdn]'
+
index 7b6291e0b629baafa7f9d91edecb2ecaaa9ab08c..f710538ff6bbf86f95f7787604d7cf24ac0892e0 100644 (file)
@@ -11,6 +11,7 @@
         - 'sxp-daily-{stream}'
         - 'sxp-integration-{stream}'
         - 'sxp-sonar'
+        - 'sxp-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[sxp]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[sxp]'
         - jacoco-report
 
+- job-template:
+    name: 'sxp-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{sxp-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: sxp
+
+    publishers:
+        - email-notification:
+            email-prefix: '[sxp]'
+
index 46add200d6fcfbd0ab476014d2e77ab14c924291..9c062572efc0f29c2ac987a1b223188972014e27 100644 (file)
@@ -11,6 +11,7 @@
         - 'tcpmd5-daily-{stream}'
         - 'tcpmd5-integration-{stream}'
         - 'tcpmd5-sonar'
+        - 'tcpmd5-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -78,7 +79,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[tcpmd5]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[tcpmd5]'
         - jacoco-report
 
+- job-template:
+    name: 'tcpmd5-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{tcpmd5-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: tcpmd5
+
+    publishers:
+        - email-notification:
+            email-prefix: '[tcpmd5]'
+
diff --git a/jjb/toolkit/toolkit.cfg b/jjb/toolkit/toolkit.cfg
new file mode 100644 (file)
index 0000000..e90804f
--- /dev/null
@@ -0,0 +1,2 @@
+DEPENDENCIES: odlparent,controller
+BRANCHES: master
diff --git a/jjb/toolkit/toolkit.yaml b/jjb/toolkit/toolkit.yaml
new file mode 100644 (file)
index 0000000..405ce20
--- /dev/null
@@ -0,0 +1,408 @@
+# REMOVE THIS LINE IF YOU WANT TO CUSTOMIZE ANYTHING BELOW
+# Otherwise this file will be automatically overwritten by the template
+# autobuilder.
+
+# ODL Releng build templates
+- project:
+    name: toolkit
+    jobs:
+        - 'toolkit-verify-{stream}'
+        - 'toolkit-merge-{stream}'
+        - 'toolkit-daily-{stream}'
+        - 'toolkit-integration-{stream}'
+        - 'toolkit-sonar'
+        - 'toolkit-clm'
+
+
+    # stream:    branch with - in place of / (eg. stable-helium)
+    # branch:    branch (eg. stable/helium)
+    stream:
+        - master:
+            branch: 'master'
+
+    project: 'toolkit'
+    jdk: 'openjdk7'
+
+# For the Job templates below replace instances of:
+# PROJECT with your project name (eg. controller)
+# MAVEN_GOALS with your maven goals to build
+# MAVEN_OPTS with your maven options to build
+
+- job-template:
+    name: 'toolkit-verify-{stream}'
+
+    # Job template for ODL verify jobs
+    #
+    # The purpose of this job template is to setup a ODL verify job
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable-helium)
+    #     branch:    branch (eg. stable/helium)
+
+    project-type: matrix
+    node: matrix_master
+    concurrent: true
+
+    axes:
+        - axis:
+            type: slave
+            name: nodes
+            values:
+                - dynamic_verify
+        - axis:
+            type: jdk
+            values:
+                - openjdk7
+
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: 'toolkit'
+            branch: '{branch}'
+
+    builders:
+        - wipe-org-opendaylight-repo
+        - maven-target:
+            maven-version: '{mvn32}'
+            pom: 'pom.xml'
+            goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+            java-opts:
+                - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: '{toolkit-settings}'
+            global-settings: '{odl-global-settings}'
+        - jacoco-nojava-workaround
+
+    publishers:
+        - findbugs
+        - email-notification:
+            email-prefix: '[toolkit]'
+        - jacoco-report
+
+- job-template:
+    name: 'toolkit-merge-{stream}'
+
+    # Job template for ODL merge jobs
+    #
+    # The purpose of this job template is to setup a ODL merge job
+    # and deploy artifacts to Nexus.
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable-helium)
+    #     branch:    branch (eg. stable/helium)
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-merged:
+            name: 'toolkit'
+            branch: '{branch}'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+        settings: '{toolkit-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    reporters:
+        - findbugs
+
+    publishers:
+        
+        - email-notification:
+            email-prefix: '[toolkit]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+        - jacoco-report
+
+- job-template:
+    name: 'toolkit-daily-{stream}'
+
+    # Job template for daily builders
+    #
+    # The purpose of this job template is to setup a daily/nightly
+    # builder and pushes to Sonar analysis.
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable-helium)
+    #     branch:    branch (eg. stable/helium)
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * *'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+        settings: '{toolkit-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    reporters:
+        - findbugs
+
+    publishers:
+        - email-notification:
+            email-prefix: '[toolkit]'
+        - jacoco-report
+
+- job-template:
+    name: 'toolkit-integration-{stream}'
+    disabled: false
+
+    # Job template for ODL merge jobs
+    #
+    # The purpose of this job template is to setup a ODL merge job
+    # and deploy artifacts to Nexus.
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable-helium)
+    #     branch:    branch (eg. stable/helium)
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: 'odlparent-merge-{stream},controller-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+        settings: '{toolkit-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    reporters:
+        - findbugs
+
+    publishers:
+        - email-notification:
+            email-prefix: '[toolkit] [odlparent] [controller]'
+        - jacoco-report
+
+- job-template:
+    name: 'toolkit-sonar'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '7'
+        numToKeep: '10'
+        artifactDaysToKeep: '1'
+        artifactNumToKeep: '1'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * *'
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dsonar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+        settings: '{toolkit-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    reporters:
+        - findbugs
+
+    publishers:
+        - sonar:
+            language: 'java'
+            maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
+        - email-notification:
+            email-prefix: '[toolkit]'
+        - jacoco-report
+
+- job-template:
+    name: 'toolkit-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{toolkit-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: toolkit
+
+    publishers:
+        - email-notification:
+            email-prefix: '[toolkit]'
+
index d35ca34c9779a588838c87206eff3349740e6fa8..14d00c485f3b47a886537c95dec6efdcfb930e46 100644 (file)
@@ -11,6 +11,7 @@
         - 'topoprocessing-daily-{stream}'
         - 'topoprocessing-integration-{stream}'
         - 'topoprocessing-sonar'
+        - 'topoprocessing-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[topoprocessing]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[topoprocessing]'
         - jacoco-report
 
+- job-template:
+    name: 'topoprocessing-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{topoprocessing-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: topoprocessing
+
+    publishers:
+        - email-notification:
+            email-prefix: '[topoprocessing]'
+
index 0793243b42705ab2aeb2295cce9b52a7dd283e22..964131d0fb656b15f81e6806cd86742587bedd6d 100644 (file)
@@ -11,6 +11,7 @@
         - 'tsdr-daily-{stream}'
         - 'tsdr-integration-{stream}'
         - 'tsdr-sonar'
+        - 'tsdr-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[tsdr]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[tsdr]'
         - jacoco-report
 
+- job-template:
+    name: 'tsdr-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{tsdr-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: tsdr
+
+    publishers:
+        - email-notification:
+            email-prefix: '[tsdr]'
+
index c7c70f4d6a17cc9b4f0fbb483e31d3929d943a27..ffee971cffd1919dc1762c742362a9cae2f1b8d1 100644 (file)
@@ -11,6 +11,7 @@
         - 'ttp-daily-{stream}'
         - 'ttp-integration-{stream}'
         - 'ttp-sonar'
+        - 'ttp-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[ttp]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[ttp]'
         - jacoco-report
 
+- job-template:
+    name: 'ttp-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{ttp-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: ttp
+
+    publishers:
+        - email-notification:
+            email-prefix: '[ttp]'
+
index 7861a6e4d5a1bfe8b0a39fcde26a255d8af811bd..52b3e6aa02172241bbed28b02d89fd552dc1b0fa 100644 (file)
@@ -11,6 +11,7 @@
         - 'usc-daily-{stream}'
         - 'usc-integration-{stream}'
         - 'usc-sonar'
+        - 'usc-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[usc]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[usc]'
         - jacoco-report
 
+- job-template:
+    name: 'usc-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{usc-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: usc
+
+    publishers:
+        - email-notification:
+            email-prefix: '[usc]'
+
index 0a3cfa8ef5e6593eb02fdc0ce7512fe48ecaa6f6..f495348aca0f1a998c2f55e64575e089b5dce8ab 100644 (file)
@@ -11,6 +11,7 @@
         - 'vpnservice-daily-{stream}'
         - 'vpnservice-integration-{stream}'
         - 'vpnservice-sonar'
+        - 'vpnservice-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -75,7 +76,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -95,6 +97,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[vpnservice]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[vpnservice]'
         - jacoco-report
 
+- job-template:
+    name: 'vpnservice-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{vpnservice-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: vpnservice
+
+    publishers:
+        - email-notification:
+            email-prefix: '[vpnservice]'
+
index c147bfe1daebee8a5e42020d1d5312c70b6c622c..d01c3d5c50cc838a41566faf8df320a41c511c57 100644 (file)
@@ -11,6 +11,7 @@
         - 'vtn-daily-{stream}'
         - 'vtn-integration-{stream}'
         - 'vtn-sonar'
+        - 'vtn-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -77,7 +78,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -97,6 +99,7 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[vtn]'
         - jacoco-report
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[vtn]'
         - jacoco-report
 
+- job-template:
+    name: 'vtn-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{vtn-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: vtn
+
+    publishers:
+        - email-notification:
+            email-prefix: '[vtn]'
+
index 9d4b878dde63ea36cfe30dfb634c664ae4bc3496..dd231f5543fd2a3ae43395ce5b973f1e7581b42f 100644 (file)
 
     project: 'yangtools'
 
+- project:
+    name: yangtools-verify-lithium
+    jobs:
+        - 'yangtools-verify-{stream}-{maven}-{jdk}'
+
+    jdk:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn31:
+            mvnver: "Maven 3.1.1"
+        - mvn32:
+            mvnver: "Maven 3.2.5"
+
+    stream:
+        - stable-lithium:
+            branch: stable/lithium
+
+    project: 'yangtools'
+
 - project:
     name: yangtools-verify-helium
     jobs:
@@ -67,7 +87,8 @@
 
     wrappers:
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
index 9810bcd8887e524640b1fb3abe8b4ef3e2b2537d..4f95904bd074eb3ccefd4b5f485322be76de243d 100644 (file)
@@ -1,2 +1,3 @@
+BRANCHES: master,stable/helium,stable/lithium
 DEPENDENCIES: odlparent
-JOB_TEMPLATES: merge,daily,integration,sonar
\ No newline at end of file
+JOB_TEMPLATES: merge,daily,integration,sonar
index d059938475c7768a411ea149474066a2ade5de9d..069070adbde033e122a6dbc5963c7c80717dd7ce 100644 (file)
@@ -10,6 +10,7 @@
         - 'yangtools-daily-{stream}'
         - 'yangtools-integration-{stream}'
         - 'yangtools-sonar'
+        - 'yangtools-clm'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -19,6 +20,8 @@
             branch: 'master'
         - stable-helium:
             branch: 'stable/helium'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     project: 'yangtools'
     jdk: 'openjdk7'
@@ -63,7 +66,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
             email-prefix: '[yangtools]'
         - jacoco-report
 
+- job-template:
+    name: 'yangtools-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
+        settings: '{yangtools-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - check-clm:
+            application-name: yangtools
+
+    publishers:
+        - email-notification:
+            email-prefix: '[yangtools]'
+
index 1c12e8ef79cd6739ca5a817538c7a823aaa594db..391ba72eba89a148803ef8a21e161ee19336e595 100644 (file)
@@ -75,6 +75,7 @@ if not templates:
 else:
     make_cfg = True
     cfg_string.append("JOB_TEMPLATES: %s" % templates)
+templates += ",clm"  # ensure we always create a clm job for all projects
 
 if not branches:
     branches = "master,stable/helium"
@@ -178,7 +179,7 @@ job_templates_yaml = ""
 for t in use_templates:
     if t == "project":  # This is not a job type but is used for templating
         pass
-    elif t == "sonar":
+    elif t == "sonar" or t == "clm":
         job_templates_yaml = job_templates_yaml + \
             "        - '%s-%s'\n" % (project, t)
     else: