Update Jenkins docs with new minion info

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

diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml
index 8ae7197186242100c9d0d693014c8cc9379ef932..0efacba61fabeecd4ea9b415f4e30dfff1905086 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
@@ -32,8 +32,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -49,23 +51,30 @@
 
     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: '{mvn33}'
             pom: 'POM'
-            goals: 'MAVEN_GOALS'
+            goals: 'MAVEN_GOALS -V -B -Djenkins -Dstream={stream}'
             java-opts:
                 - 'MAVEN_OPTS'
-            settings: '{PROJECT-settings}'
-            global-settings: '{odl-global-settings}'
-        - jacoco-nojava-workaround
+            settings: 'JENKINS_SETTINGS'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     publishers:
+        ARCHIVE_ARTIFACTS
         - findbugs
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'