X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fusc%2Fusc.yaml;h=5435e178835fc72074a9f8bde03d23a1b2367346;hb=c0005a1499d962ed366d089a8bb1d40cc6b38657;hp=2b7b8ab133d8e9625895a8d1227869bf5e5b6b3e;hpb=f77aac03fe3caf44333becc1d96d63ed4842c268;p=releng%2Fbuilder.git

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 2b7b8ab13..5435e1788 100644
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -11,15 +11,19 @@
         - 'usc-daily-{stream}'
         - 'usc-integration-{stream}'
         - 'usc-sonar'
+        - 'usc-clm'
+
 
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
     stream:
         - master:
             branch: 'master'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'usc'
-    jdk: 'openjdk7'
 
 # For the Job templates below replace instances of:
 # PROJECT with your project name (eg. controller)
@@ -37,10 +41,19 @@
     #     stream:    branch with - in place of / (eg. stable-helium)
     #     branch:    branch (eg. stable/helium)
 
-    project-type: maven
-    node: dynamic_verify
+    project-type: matrix
+    node: matrix_master
     concurrent: true
-    jdk: '{jdk}'
+
+    axes:
+        - axis:
+            type: slave
+            name: nodes
+            values:
+                - dynamic_verify
+        - axis:
+            type: jdk
+            values: '{obj:jdks}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -63,26 +76,28 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
             name: 'usc'
             branch: '{branch}'
 
-    prebuilders:
+    builders:
         - 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 '
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{usc-settings}'
-        global-settings: '{odl-global-settings}'
-        ignore-upstream-changes: true
+        - 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: '{usc-settings}'
+            global-settings: '{odl-global-settings}'
+        - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[usc]'
         - jacoco-report
@@ -122,7 +137,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -140,6 +156,12 @@
         settings: '{usc-settings}'
         global-settings: '{odl-global-settings}'
 
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    reporters:
+        - findbugs
+
     publishers:
         
         - email-notification:
@@ -185,7 +207,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
@@ -201,6 +224,12 @@
         settings: '{usc-settings}'
         global-settings: '{odl-global-settings}'
 
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    reporters:
+        - findbugs
+
     publishers:
         - email-notification:
             email-prefix: '[usc]'
@@ -210,10 +239,11 @@
     name: 'usc-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
@@ -242,7 +272,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
@@ -260,13 +291,15 @@
         settings: '{usc-settings}'
         global-settings: '{odl-global-settings}'
 
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    reporters:
+        - findbugs
+
     publishers:
         - email-notification:
             email-prefix: '[usc] [controller] [yangtools] [odlparent]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
         - jacoco-report
 
 - job-template:
@@ -274,7 +307,7 @@
 
     project-type: maven
     node: dynamic_verify
-    jdk: '{jdk}'
+    jdk: 'openjdk7'
 
     logrotate:
         daysToKeep: '7'
@@ -295,7 +328,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
@@ -308,6 +342,12 @@
         settings: '{usc-settings}'
         global-settings: '{odl-global-settings}'
 
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    reporters:
+        - findbugs
+
     publishers:
         - sonar:
             language: 'java'
@@ -315,3 +355,55 @@
         - email-notification:
             email-prefix: '[usc]'
         - jacoco-report
+
+- job-template:
+    name: 'usc-clm'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '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}'
+
+    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]'
+