Merge "new job to run tempest tests with openstack+odl"

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

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 7c632aa62f89d6c3b8dd20b7e57fd32feb439bb0..5e9b0146587cbea000d75a1d66ae4883f63fcb79 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -19,6 +19,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk8
+            jdks:
+                - openjdk8
+                - openjdk7
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk8
@@ -424,7 +431,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout