From f19b85ecf92532e757a4331348c73f5e7f2d970e Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Mon, 11 Aug 2014 15:08:18 -0400
Subject: [PATCH] add experimental job for nova with f20 virt-preview

This patch adds an experimental job to nova that uses the Fedora 20
node type that has the virt-preview repository enabled.  This will run
the usual full tempest suite, but with the latest versions of libvirt
and qemu installed.

This revision of the patch unfortunately duplicates the jenkins job
config.  It seems like that shouldn't be necessary, but I haven't
figured out the right way to massage that into place just yet.

Change-Id: I9d0d7feb68bd16997a5d9fc4a639aec4473ee2b4
---
 .../config/devstack-gate.yaml                 | 31 +++++++++++++++++++
 .../jenkins_job_builder/config/projects.yaml  |  5 +++
 .../openstack_project/files/zuul/layout.yaml  |  1 +
 .../files/zuul/openstack_functions.py         |  2 ++
 4 files changed, 39 insertions(+)

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 a4e69ffd3f..e8ed74b03d 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
@@ -121,6 +121,36 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-full-newlibvirt{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 125
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          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-master-dsvm-full{branch-designator}'
     node: '{node}'
@@ -1525,3 +1555,4 @@
       - '{pipeline}-tempest-dsvm-neutron-keystonev3-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-nova-v3-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-full-ceph{branch-designator}'
+      - '{pipeline}-tempest-dsvm-full-newlibvirt{branch-designator}'
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 9f52654835..d8eb97a51b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -913,6 +913,11 @@
       - gate-{name}-pylint
       - gate-{name}-pip-missing-reqs
       - translation-jobs
+      - '{pipeline}-tempest-dsvm-full-newlibvirt{branch-designator}':
+          pipeline: experimental
+          node: 'devstack-f20-virt-preview'
+          branch-designator: ''
+          branch-override: default
 
 - project:
     name: nova-specs
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index b2b6ad084e..7dfa83e084 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1249,6 +1249,7 @@ projects:
       - check-tempest-dsvm-neutron-pg
       - check-tempest-dsvm-nova-v3-full
       - gate-nova-pip-missing-reqs
+      - check-tempest-dsvm-full-newlibvirt
     silent:
       - check-tempest-dsvm-docker
     experimental-tripleo:
diff --git a/modules/openstack_project/files/zuul/openstack_functions.py b/modules/openstack_project/files/zuul/openstack_functions.py
index 6021a224dc..f03f3ae1cf 100644
--- a/modules/openstack_project/files/zuul/openstack_functions.py
+++ b/modules/openstack_project/files/zuul/openstack_functions.py
@@ -53,6 +53,8 @@ def devstack_params(item, job, params):
         params['ZUUL_NODE'] = 'devstack-centos7'
     elif 'aiopcpu' in job.name:
         params['ZUUL_NODE'] = 'devstack-trusty-2-node'
+    elif 'newlibvirt' in job.name:
+        params['ZUUL_NODE'] = 'devstack-f20-virt-preview'
     else:
         params['ZUUL_NODE'] = 'devstack-trusty'