From f67703d472e4a7b49c5ac7fba480380b89f0ad8c Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 13 Nov 2015 17:43:00 -0500
Subject: [PATCH] Add gate-ansible-dsvm-functional-centos7-nv job

Change-Id: I4cbac8aadff68e6b6469c32dc9c3978060740b42
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 jenkins/jobs/ansible-role-jobs.yaml | 18 ++++++++++++++++++
 jenkins/jobs/projects.yaml          |  5 +++++
 zuul/layout.yaml                    |  1 +
 3 files changed, 24 insertions(+)

diff --git a/jenkins/jobs/ansible-role-jobs.yaml b/jenkins/jobs/ansible-role-jobs.yaml
index 990105ee42..7299921310 100644
--- a/jenkins/jobs/ansible-role-jobs.yaml
+++ b/jenkins/jobs/ansible-role-jobs.yaml
@@ -13,6 +13,24 @@
     publishers:
       - console-log
 
+- job-template:
+    name: '{pipeline}-ansible-dsvm-functional-{ostype}{job-suffix}'
+    node: 'devstack-{ostype}'
+
+    builder:
+      - zuul-clone:
+          project: $ZUUL_PROJECT
+      # NOTE(pabelanger): We should be using the tox builder for this, however I
+      # cannot see a better way of adding cd $ZUUL_PROJECT without exposing a
+      # new variable to the tox builder.
+      - shell: |
+          #!/bin/bash -xe
+          cd $ZUUL_PROJECT
+          /usr/local/jenkins/slave_scripts/run-tox.sh ansible-functional
+
+    publishers:
+      - zuul-swift-upload-console-log
+
 - job-group:
     name: 'ansible-lint-jobs'
     jobs:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index e2b850ba59..f1fdd0a335 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -38,6 +38,11 @@
     tarball-site: tarballs.openstack.org
 
     jobs:
+      - '{pipeline}-ansible-dsvm-functional-{ostype}{job-suffix}':
+          job-suffix: '-nv'
+          ostype:
+            - centos7
+          pipeline: gate
       # NOTE(pabelanger): We should talk to other ansible project and see about
       # migrating gate-{project}-ansible-lint to use tox. Then we can drop this
       # gate in favor for that.
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c41a7c7f74..248adca203 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3554,6 +3554,7 @@ projects:
       - name: merge-check
     check:
       - gate-ansible-role-nodepool-tox-ansible-lint
+      - gate-ansible-dsvm-functional-centos7-nv
     gate:
       - gate-ansible-role-nodepool-tox-ansible-lint