From c29ff0be3be8fd01cde9e4ffd0dcadac7f378f0b Mon Sep 17 00:00:00 2001
From: Tom Flynn <tom.flynn@gmail.com>
Date: Wed, 20 Nov 2019 18:49:40 +0000
Subject: [PATCH] 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
---
 jjb/opflex/opflex-custom.yaml                  | 2 +-
 jjb/opflex/opflex-thirdparty-dependencies.yaml | 2 +-
 jjb/opflex/opflex.yaml                         | 2 +-
 jjb/opflex/scripts/openvswitch-build.sh        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index f7fe12edd..5d2b2e7e2 100644
--- 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 a02fbb9dc..46ba2451c 100644
--- 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 5cc90942a..f0ab29202 100644
--- 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 f93afe536..61ae9b4b8 100644
--- 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
-- 
2.36.6