Merge "Jenkins build template controller-csit-rest-cars-perf"

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

diff --git a/jjb/armoury/armoury.cfg b/jjb/armoury/armoury.cfg
index 7e2aed2084047774b0022d13420408a48dceba18..a97541e53cf51fb26bb881ec08c76c1ef41fb725 100644 (file)
--- a/jjb/armoury/armoury.cfg
+++ b/jjb/armoury/armoury.cfg
@@ -1,12 +1,6 @@
 STREAMS:
 - beryllium:
     branch: master
-    jdks: openjdk7
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-- stable-helium:
-    branch: stable/helium
-    jdks: openjdk7
+    jdks: openjdk8,openjdk7
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
 DEPENDENCIES: odlparent,yangtools,controller,mdsal