Ubuntu Pastebin

Paste from paelzer at Mon, 19 Jun 2017 13:41:47 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
diff -Nru openvswitch-2.7.0/debian/changelog openvswitch-2.7.0/debian/changelog
--- openvswitch-2.7.0/debian/changelog	2017-06-14 08:04:13.000000000 +0200
+++ openvswitch-2.7.0/debian/changelog	2017-06-19 15:10:48.000000000 +0200
@@ -1,3 +1,10 @@
+openvswitch (2.7.0-0ubuntu3) artful; urgency=medium
+
+  * debian/test/vanilla, debian/test/dpdk: stop openvswitch-testcontroller
+    as it conflicts with tests for mininet >=2.2.2-1 (LP: #1698808).
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Mon, 19 Jun 2017 14:59:32 +0200
+
 openvswitch (2.7.0-0ubuntu2) artful; urgency=medium
 
   * d/control, d/rules: Enable DPDK support on Arm (LP: #1691659)
diff -Nru openvswitch-2.7.0/debian/tests/dpdk openvswitch-2.7.0/debian/tests/dpdk
--- openvswitch-2.7.0/debian/tests/dpdk	2017-03-15 13:34:41.000000000 +0100
+++ openvswitch-2.7.0/debian/tests/dpdk	2017-06-19 15:40:33.000000000 +0200
@@ -31,6 +31,9 @@
 pgrep ovsdb-server
 echo "OK"
 
+echo "stop conflicting openvswitch testcontroller"
+systemctl stop openvswitch-testcontroller || true
+
 echo -n "running openflow tests using mininet"
 python `dirname $0`/openflow.py 2>&1
 echo "OK"
diff -Nru openvswitch-2.7.0/debian/tests/vanilla openvswitch-2.7.0/debian/tests/vanilla
--- openvswitch-2.7.0/debian/tests/vanilla	2017-03-15 13:34:41.000000000 +0100
+++ openvswitch-2.7.0/debian/tests/vanilla	2017-06-19 15:40:33.000000000 +0200
@@ -14,6 +14,9 @@
 pgrep ovsdb-server
 echo "OK"
 
+echo "stop conflicting openvswitch testcontroller"
+systemctl stop openvswitch-testcontroller || true
+
 echo -n "running openflow tests using mininet"
 python `dirname $0`/openflow.py 2>&1
 echo "OK"
Download as text