Remove build-timeout macro from csit-[1,3]node-periodic templates

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

diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
index 84e23522a6e5014a717adcd7ab29c1ab15bb95fb..d6ff863ea02cd1c7dc5fc670f0550194b98d1e66 100644 (file)
--- a/jjb-templates/integration.yaml
+++ b/jjb-templates/integration.yaml
@@ -9,8 +9,8 @@
     # is successfully built.
     #
     # 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: maven
     node: dynamic_merge
@@ -45,6 +45,7 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
 
     maven:
         maven-name: '{mvn33}'
@@ -54,9 +55,6 @@
         settings: '{PROJECT-settings}'
         global-settings: '{odl-global-settings}'
 
-    postbuilders:
-        - jacoco-nojava-workaround
-
     reporters:
         - findbugs