Change distribution-check job to do verification in same job

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

diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml
index e2bab37130066340da5effb69945f0569b3e8d76..00b0f21ac5a710e13d673c07799f0e25ca85e196 100644 (file)
--- a/jjb-templates/verify.yaml
+++ b/jjb-templates/verify.yaml
@@ -1,13 +1,13 @@
 - job-template:
-    name: 'PROJECT-verify-{stream}'
+    name: 'PROJECT_SHORTNAME-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)
+    #     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}'
@@ -35,6 +34,8 @@ JDKS
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -45,27 +46,31 @@ JDKS
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
-            name: 'PROJECT'
+            name: 'PROJECT_PATH'
             branch: '{branch}'
 
     builders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
         - maven-target:
-            maven-version: '{mvn32}'
+            maven-version: '{mvn33}'
             pom: 'POM'
-            goals: 'MAVEN_GOALS'
+            goals: 'MAVEN_GOALS -Djenkins -Dstream={stream}'
             java-opts:
                 - 'MAVEN_OPTS'
-            settings: '{PROJECT-settings}'
+            settings: '{JENKINS_SETTINGS}'
             global-settings: '{odl-global-settings}'
-        - jacoco-nojava-workaround
 
     publishers:
         - findbugs
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'
         - jacoco-report