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

[releng/builder.git] / jjb / opflex / opflex-thirdparty-dependencies.yaml

diff --git a/jjb/opflex/opflex-thirdparty-dependencies.yaml b/jjb/opflex/opflex-thirdparty-dependencies.yaml
index a0f30f7244813921eac626511a9cbabc81254e3c..46ba2451c7dd40333c1eae124d0c774de07d11fb 100644 (file)
--- a/jjb/opflex/opflex-thirdparty-dependencies.yaml
+++ b/jjb/opflex/opflex-thirdparty-dependencies.yaml
@@ -10,8 +10,9 @@
       - oxygen:
           branch: 'master'
           libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
+          rapidjson-version: '1.1.0'
+          openvswitch-version: '2.12.0'
+          disable-job: true
 
     project: 'opflex'
 
@@ -26,9 +27,12 @@
 - job-template:
     name: 'opflex-thirdparty-libuv-{stream}'
 
+    disable-job: false
+
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
+    disabled: '{disable-job}'
 
     group-id: 'libuv'
 
@@ -62,6 +66,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - opflex-build-libuv
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
@@ -117,6 +122,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - opflex-build-rapidjson
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
@@ -172,6 +178,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - opflex-build-openvswitch
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'