Fix python test by downloading the test repo in its own basedir

[releng/builder.git] / jjb / controller / controller.yaml

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 6a33450b277f770125bf931737b4389067325110..03aaa533e68f1ebc01ab1e5b10578a17c1a11371 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -15,26 +15,26 @@
         - 'controller-clm-{stream}'
 
 
-    # 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)
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-        - stable-helium:
-            branch: 'stable/helium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
+        - stable-helium:
+            branch: 'stable/helium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'controller'
 
@@ -51,8 +51,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
@@ -99,6 +99,7 @@
 
     builders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
@@ -107,7 +108,6 @@
                 - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
             settings: '{controller-settings}'
             global-settings: '{odl-global-settings}'
-        - jacoco-nojava-workaround
 
     publishers:
         - findbugs
@@ -124,8 +124,8 @@
     # and deploy artifacts to Nexus.
     #
     # 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
@@ -191,8 +191,8 @@
     # builder and pushes to Sonar analysis.
     #
     # 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_verify
@@ -246,6 +246,10 @@
 - job-template:
     name: 'controller-distribution-{stream}'
 
+    # Required variables:
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
+
     project-type: maven
     node: dynamic_merge
     jdk: '{jdk}'
@@ -307,8 +311,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