X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fopflex%2Fopflex-custom.yaml;h=593d22a9778acc8cb9a9897c1045c1385f69bda4;hb=9f80eab4fa3bf05322ca685151148b7a3cf12327;hp=ffa23c14a1a4f2fc1bf08dd7736ae409e3af722c;hpb=5bb4581c51fde9a78d259d7460a48608ea5185b1;p=releng%2Fbuilder.git

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index ffa23c14a..593d22a97 100644
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -6,18 +6,18 @@
       - 'opflex-merge-{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'
+      - oxygen:
+          branch: 'stable/oxygen'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - carbon:
-          branch: 'stable/carbon'
+      - nitrogen:
+          branch: 'stable/nitrogen'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
@@ -30,9 +30,9 @@
     name: 'opflex-verify-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -91,8 +91,8 @@
 - job-template:
     name: 'opflex-merge-{stream}'
 
-    node: centos7-java-builder-2c-8g
-    jdk: '{jdk}'
+    node: centos7-builder-2c-8g
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties: