Merge "Adding upstream dependencies into GBP clustering"

[releng/builder.git] / jjb-templates / verify.yaml

diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml
index e2bab37130066340da5effb69945f0569b3e8d76..2af97cd31179bf83fc1a785c3bb056bdc46a33d4 100644 (file)
--- a/jjb-templates/verify.yaml
+++ b/jjb-templates/verify.yaml
@@ -6,8 +6,8 @@
     # 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)
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: matrix
     node: matrix_master
@@ -21,8 +21,7 @@
                 - dynamic_verify
         - axis:
             type: jdk
-            values:
-JDKS
+            values: '{obj:jdks}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -45,7 +44,8 @@ JDKS
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -54,15 +54,15 @@ JDKS
 
     builders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
         - maven-target:
-            maven-version: '{mvn32}'
+            maven-version: '{mvn33}'
             pom: 'POM'
             goals: 'MAVEN_GOALS'
             java-opts:
                 - 'MAVEN_OPTS'
             settings: '{PROJECT-settings}'
             global-settings: '{odl-global-settings}'
-        - jacoco-nojava-workaround
 
     publishers:
         - findbugs