X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fvtn%2Fvtn.yaml;h=8cce8c486b16a2667308c5569109e55e27cd7ae6;hb=bc254cc10bd95cb176b303d4c25b339220b15806;hp=e54e49214674af4e6a32197022fa88247d08b8df;hpb=6d433e51efb8ae2b6f55efa55fdac1a498be7942;p=releng%2Fbuilder.git

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index e54e49214..8cce8c486 100644
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -9,8 +9,10 @@
         - 'vtn-verify-{stream}'
         - 'vtn-merge-{stream}'
         - 'vtn-daily-{stream}'
+        - 'vtn-distribution-{stream}'
         - 'vtn-integration-{stream}'
         - 'vtn-sonar'
+        - 'vtn-clm-{stream}'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -18,11 +20,21 @@
     stream:
         - master:
             branch: 'master'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
         - stable-helium:
             branch: 'stable/helium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'vtn'
-    jdk: 'openjdk7'
 
 # For the Job templates below replace instances of:
 # PROJECT with your project name (eg. controller)
@@ -52,9 +64,7 @@
                 - dynamic_verify
         - axis:
             type: jdk
-            values:
-                - openjdk7
-
+            values: '{obj:jdks}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -77,7 +87,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -86,17 +97,18 @@
 
     builders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
         - maven-target:
-            maven-version: '{mvn32}'
+            maven-version: '{mvn33}'
             pom: 'pom.xml'
             goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
                 - '-Xmx1024m -XX:MaxPermSize=256m'
             settings: '{vtn-settings}'
             global-settings: '{odl-global-settings}'
-        - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[vtn]'
         - jacoco-report
@@ -136,7 +148,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -145,17 +158,18 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
+        goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{vtn-settings}'
         global-settings: '{odl-global-settings}'
 
-    postbuilders:
-        - jacoco-nojava-workaround
+    reporters:
+        - findbugs
 
     publishers:
         - archive-artifacts:
@@ -203,38 +217,94 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
+        goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{vtn-settings}'
         global-settings: '{odl-global-settings}'
 
-    postbuilders:
-        - jacoco-nojava-workaround
+    reporters:
+        - findbugs
 
     publishers:
         - email-notification:
             email-prefix: '[vtn]'
         - jacoco-report
 
+- job-template:
+    name: 'vtn-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn33}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'vtn-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)
@@ -263,30 +333,32 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
-            jobs: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream},openflowplugin-merge-{stream}'
+            jobs: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream},neutron-merge-{stream}'
             result: 'success'
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
+        goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{vtn-settings}'
         global-settings: '{odl-global-settings}'
 
-    postbuilders:
-        - jacoco-nojava-workaround
+    reporters:
+        - findbugs
 
     publishers:
         - email-notification:
-            email-prefix: '[vtn] [odlparent] [controller] [yangtools] [openflowplugin]'
+            email-prefix: '[vtn] [odlparent] [controller] [yangtools] [openflowplugin] [ovsdb] [neutron]'
         - jacoco-report
 
 - job-template:
@@ -294,7 +366,7 @@
 
     project-type: maven
     node: dynamic_verify
-    jdk: '{jdk}'
+    jdk: 'openjdk7'
 
     logrotate:
         daysToKeep: '7'
@@ -315,21 +387,28 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
+        - gerrit-trigger-patch-sonar:
+            name: 'vtn'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dsonar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{vtn-settings}'
         global-settings: '{odl-global-settings}'
 
-    postbuilders:
-        - jacoco-nojava-workaround
+    reporters:
+        - findbugs
 
     publishers:
         - sonar:
@@ -339,3 +418,54 @@
             email-prefix: '[vtn]'
         - jacoco-report
 
+- job-template:
+    name: 'vtn-clm-{stream}'
+
+    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: '@weekly'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn33}'
+        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]'
+