From f90d35885e1143e5a1b67804735fd0c2f294457c Mon Sep 17 00:00:00 2001
From: Markus Zoeller <mzoeller@de.ibm.com>
Date: Mon, 7 Mar 2016 11:48:45 +0100
Subject: [PATCH] Add job to test Nova with specific libvirt and kvm packages

Nova has sometimes the need to exploit features of libvirt which
are not yet in the default libvirt version of our testing
infrastructure.
This change adds a test job which is able to set up a devstack node
which runs with specific libvirt and kvm packages.

Change-Id: Ifd231857cffd134e911225088d6dc65bf61fdedd
---
 jenkins/jobs/devstack-gate.yaml | 37 +++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml      |  5 +++++
 zuul/layout.yaml                |  5 +++++
 3 files changed, 47 insertions(+)

diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 86e350f6be..2d3272a520 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -597,6 +597,43 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-nova-libvirt-kvm-apr{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 180
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export PROJECTS="openstack/devstack-plugin-additional-pkg-repos $PROJECTS"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin apr git://git.openstack.org/openstack/devstack-plugin-additional-pkg-repos"
+          # We want to test the latest libvirt with kvm version with that plugin
+          # TODO: (markus_z) rename that in the apr repo to "libvirt-kvm"
+          #       to make the chosen virtualization technology explicit.
+          export LATEST_CODEBASES=libvirt
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - devstack-logs
+      - console-log
+
 - job-template:
     name: '{pipeline}-tempest-dsvm-lxc-f23{job-suffix}'
     node: 'fedora-23'
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index b0ad8ece11..64e4c5284f 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1205,6 +1205,11 @@
           node: ubuntu-trusty
           job-suffix: '-nv'
           branch-override: default
+      - '{pipeline}-tempest-dsvm-nova-libvirt-kvm-apr{job-suffix}':
+          pipeline: gate
+          node: ubuntu-trusty
+          job-suffix: ''
+          branch-override: default
       # Experimental jobs for testing dib images.
       - '{pipeline}-tempest-dsvm-full{job-suffix}':
           pipeline: gate
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 20371f7dfd..b19c77e031 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1401,6 +1401,10 @@ jobs:
           - ^tox.ini$
     voting: false
 
+  - name: gate-tempest-dsvm-nova-libvirt-kvm-apr
+    branch: ^(?!stable/(kilo|liberty|mitaka)).*$
+    voting: false
+
   - name: gate-tempest-dsvm-neutron-multinode-full
     voting: false
 
@@ -7646,6 +7650,7 @@ projects:
       - gate-tempest-dsvm-neutron-src-oslo.versionedobjects
       - gate-tempest-dsvm-multinode-live-migration
       - gate-tempest-dsvm-nova-os-vif-nv
+      - gate-tempest-dsvm-nova-libvirt-kvm-apr
 
   - name: openstack/nova-docker
     template: