X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopflex%2Fopflex.yaml;h=c3c7a6699b8b6b4c5a39f0c7ed8d8745d35f5750;hb=c4f5571795775e56ec9bef76c40247c4c34cd755;hp=7dd048e1ae472a35ebafee2a8c7e6f87584238ab;hpb=d73cb2bc14859b41b38cb81a78288308da03d0a9;p=releng%2Fbuilder.git

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index 7dd048e1a..c3c7a6699 100644
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -5,26 +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'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
-      - carbon:
-          branch: 'stable/carbon'
+      - oxygen:
+          branch: 'stable/oxygen'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - boron:
-          branch: 'stable/boron'
-          libuv-version: '1.7.5'
-          rapidjson-version: '1.0.1'
-          openvswitch-version: 'origin/noiro'
 
     project: 'opflex'
     project-name: 'opflex'
@@ -32,6 +22,7 @@
     jdk: 'openjdk8'
 
     branch: master
+    build-timeout: 60
     global-settings-file: global-settings
     settings-file: opflex-settings
     group-id: org.opendaylight.opflex
@@ -43,8 +34,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 #