Install openvswitch kernel module for netvirt IT

Install openvswitch kernel module that is included
with the OS (CentOS) before running any netvirt IT tests.

This works, but I am also considering (testing) creating
a new vm, that will have centos7, docker, and ovs-2.5,
so that we don't have to modprobe from netvirt job.

VM name would be something like centos7-docker-ovs-2-5-xxx.

Change-Id: I3e7a83f2175322043ae95d3ea95f0ab13dece8c1
Signed-off-by: Victor Pickard <vpickard@redhat.com>

diff --git a/jjb/netvirt/include-setup-controllerIp.sh b/jjb/netvirt/include-setup-controllerIp.sh
deleted file mode 100644 (file)
index ed73ec2..0000000
--- a/jjb/netvirt/include-setup-controllerIp.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "---> Setting up controller IP"
-CONTROLLER_IP=`facter ipaddress`
-echo "CONTROLLER_IP=${CONTROLLER_IP}" > env.properties

diff --git a/jjb/netvirt/include-setup-misc.sh b/jjb/netvirt/include-setup-misc.sh
new file mode 100644 (file)
index 0000000..b11ff73
--- /dev/null
+++ b/jjb/netvirt/include-setup-misc.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+echo "---> Setting up controller IP"
+CONTROLLER_IP=`facter ipaddress`
+echo "CONTROLLER_IP=${CONTROLLER_IP}" > env.properties
+
+echo "---> Loading OVS kernel module"
+sudo /usr/sbin/modprobe openvswitch
+
+echo "---> Verifying OVS kernel module loaded"
+/usr/sbin/lsmod | /usr/bin/grep openvswitch
+

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 10fd4fdaf440a1e3fe270456b0b277374762e298..8cd177d9ad0fecb62672a7eec1a4cab6720df366 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -111,7 +111,7 @@
             properties-content: OVS_VERSION={OVS_VERSION}
         - shell:
             !include-raw-escape:
-                - include-setup-controllerIp.sh
+                - include-setup-misc.sh
         - inject:
             properties-file: env.properties
         - install-docker-compose