From 16de7111e3d9f4ada0f8a0846dd35af9bb358e7e Mon Sep 17 00:00:00 2001
From: Devananda van der Veen <devananda.vdv@gmail.com>
Date: Fri, 14 Mar 2014 11:21:03 -0700
Subject: [PATCH] Fix the virtual-ironic job's export list

The job was trying to export ENV vars to devstack, but these aren't
passed all the way down. This patch depends on a patch to devstack-gate
which sets the right vars there:
  https://review.openstack.org/#/c/80653/

This patch also adds a few comments explaining the peculiar test setup,
and a work-around for libvirt bug
  https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1248025

Change-Id: Ibf2b2b0d2ae491793f291562d63299562bd83ebe
---
 .../config/devstack-gate.yaml                 | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index 47cc165735..7ce7bdc8b7 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -431,27 +431,30 @@
           export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_IRONIC=1
+          export DEVSTACK_GATE_VIRT_DRIVER=ironic
           export DEVSTACK_GATE_SMOKE_SERIAL=1
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
 
-          export BM_BUILD_DEPLOY_RAMDISK=True
-          export BM_DEPLOY_FLAVOR="-a amd64 ubuntu deploy-ironic"
-          export IRONIC_VM_COUNT=1
-          export IRONIC_VM_SPECS_RAM=512
-          export IRONIC_VM_SPECS_DISK=10
-          export IRONIC_BAREMETAL_BASIC_OPS=True
-          export VIRT_DRIVER=ironic
+          # pull in ovs support from ubuntu cloud-archive.
+          sudo add-apt-repository cloud-archive:havana
+          sudo apt-get update
 
+          # work around bug in libvirt-bin on rax nodes, pending fixes to bug:
+          # https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1248025
+          sudo service nova-agent stop || echo ''
+          sudo service xe-linux-distribution stop || echo ''
+          if [ -e /proc/xen ] ; then 
+              sudo umount /proc/xen
+          fi
+
+          # prevent sshd from jumping to the ovs bridge on Precise instances.
           IP=$(ip addr show eth0 | grep 'inet ' | sed 's/inet \([0-9\.]*\)\/.*/\1/' | tr -d ' ')
           sudo sed -i "s/#ListenAddress 0.0.0.0/ListenAddress $IP/" /etc/ssh/sshd_config
           sudo service ssh restart
 
-          sudo add-apt-repository cloud-archive:havana
-          sudo apt-get update
-
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh