Upgrade OVS dep for opflex from 2.6.7 to 2.12.0

Signed-off-by: Tom Flynn <tom.flynn@gmail.com>
Change-Id: I9aab354b85a50dc7949260049f9ae1b3f3563c25

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index f7fe12edd2ab1150b16b5d6e71c21802782c68ab..5d2b2e7e2e2ca8a01ef154759f4f349b6a29195c 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -10,7 +10,7 @@
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.1.0'
-          openvswitch-version: '2.6.7'
+          openvswitch-version: '2.12.0'
       - sodium:
           branch: 'stable/sodium'
           libuv-version: '1.8.0'

diff --git a/jjb/opflex/opflex-thirdparty-dependencies.yaml b/jjb/opflex/opflex-thirdparty-dependencies.yaml
index a02fbb9dc183ce9ee910faef5ebde12d353a187c..46ba2451c7dd40333c1eae124d0c774de07d11fb 100644 (file)
--- a/jjb/opflex/opflex-thirdparty-dependencies.yaml
+++ b/jjb/opflex/opflex-thirdparty-dependencies.yaml
@@ -11,7 +11,7 @@
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.1.0'
-          openvswitch-version: '2.6.7'
+          openvswitch-version: '2.12.0'
           disable-job: true
 
     project: 'opflex'

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index 5cc90942a1b03814e7119bca2486fae01ec3640a..f0ab2920287edc70354f7cd1f69c746ded0bc62e 100644 (file)
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -14,7 +14,7 @@
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.1.0'
-          openvswitch-version: '2.6.7'
+          openvswitch-version: '2.12.0'
       - sodium:
           branch: 'stable/sodium'
           libuv-version: '1.8.0'

diff --git a/jjb/opflex/scripts/openvswitch-build.sh b/jjb/opflex/scripts/openvswitch-build.sh
index f93afe536107c50834bee5b0782edd0f2a31257f..61ae9b4b8abb8fd381b203adc80c29cf067666ac 100644 (file)
--- a/jjb/opflex/scripts/openvswitch-build.sh
+++ b/jjb/opflex/scripts/openvswitch-build.sh
@@ -25,7 +25,7 @@ mkdir -p "$DESTDIR"
 make -j4
 DESTDIR=$(pwd)/$DESTDIR make install
 
-if [[ $OPENVSWITCH_VERSION =~ 2.6.7 ]]; then
+if [[ $OPENVSWITCH_VERSION =~ 2.12.0 ]]; then
     mkdir -p $DESTDIR/$ROOT/include/openvswitch/openvswitch
     mv $DESTDIR/$ROOT/include/openvswitch/*.h $DESTDIR/$ROOT/include/openvswitch/openvswitch
     mv $DESTDIR/$ROOT/include/openflow $DESTDIR/$ROOT/include/openvswitch