Merge "Upgrade OVS dep for opflex from 2.6.7 to 2.12.0"

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

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 073a49077e4b844a8fcfc1fd97c8a23d809f4e23..5d2b2e7e2e2ca8a01ef154759f4f349b6a29195c 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -6,9 +6,14 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
           libuv-version: '1.8.0'
+          rapidjson-version: '1.1.0'
+          openvswitch-version: '2.12.0'
+      - sodium:
+          branch: 'stable/sodium'
+          libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
       - neon:
@@ -16,16 +21,6 @@
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - fluorine:
-          branch: 'stable/fluorine'
-          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'
 
     project: 'opflex'
     archive-artifacts: '**/*.tar.gz'
@@ -34,10 +29,13 @@
 - job-template:
     name: 'opflex-verify-{stream}'
 
+    disable-job: false
+
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties: