Merge "Rename opflex jobs with -thirdparty- keyword"

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

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index 7aba1275a92698554e4f6cdf59e7e45e5bfef2ba..6e2100179e6fb8fe7c254bfc6a1c8cd066aa2b85 100644 (file)
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -5,11 +5,16 @@
       - 'opflex-release-{stream}'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
+      - oxygen:
+          branch: 'stable/oxygen'
+          libuv-version: '1.8.0'
+          rapidjson-version: '1.0.2'
+          openvswitch-version: '2.6.0'
       - nitrogen:
           branch: 'stable/nitrogen'
           libuv-version: '1.8.0'
@@ -27,6 +32,7 @@
     jdk: 'openjdk8'
 
     branch: master
+    build-timeout: 60
     global-settings-file: global-settings
     settings-file: opflex-settings
     group-id: org.opendaylight.opflex
@@ -38,8 +44,8 @@
 - job-template:
     name: 'opflex-release-{stream}'
 
-    node: centos7-java-builder-2c-8g
-    jdk: '{jdk}'
+    node: centos7-builder-2c-8g
+    jdk: '{java-version}'
 
     ######################
     # Default parameters #