From 30e9a0d0bc71a9ab159c6ebcedf9df8cb83f0b00 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Wed, 31 Aug 2016 13:44:01 +0100
Subject: [PATCH] Add OSA keystone uwsgi functional tests

This patch adds non-voting checks to the OSA keystone role for
nginx/uwsgi and apache/uwsgi functional testing.

Change-Id: Iad530f42ba3ff6356123fdfb98880312e87d95b6
Depends-On: Idf9e48b0c93174648982cf27cf922d3801565c74
Depends-On: I5c89e4d9925a3077111aabe85aaa6f6eaa944848
---
 jenkins/jobs/projects.yaml | 20 ++++++++++++++++++++
 zuul/layout.yaml           |  7 +++++++
 2 files changed, 27 insertions(+)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index decfc88b88..b0c3b466ac 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -7477,6 +7477,26 @@
       - gate-{name}-requirements
       - openstack-publish-jobs
       - openstack-releasenotes-jobs
+      - '{pipeline}-{name}-ansible-{scenario}-{ostype}{job-suffix}':
+          job-suffix: '-nv'
+          ostype:
+            - centos-7
+            - ubuntu-trusty
+            - ubuntu-xenial
+          pipeline: gate
+          scenario:
+            - func_uwsgi_nginx
+            - func_uwsgi_apache
+      - '{pipeline}-{name}-ansible-{scenario}-{ostype}{job-suffix}':
+          job-suffix: ''
+          ostype:
+            - centos-7
+            - ubuntu-trusty
+            - ubuntu-xenial
+          pipeline: gate
+          scenario:
+            - func_uwsgi_nginx
+            - func_uwsgi_apache
 
 - project:
     name: openstack-ansible-os_magnum
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 633ca33fb7..8a4fe6d178 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -11572,6 +11572,13 @@ projects:
       - name: ansible-role-functional-jobs-centos7-nv
       - name: ansible-role-functional-jobs-trusty
       - name: ansible-role-functional-jobs-xenial
+    check:
+      - gate-openstack-ansible-os_keystone-ansible-func_uwsgi_nginx-centos-7-nv
+      - gate-openstack-ansible-os_keystone-ansible-func_uwsgi_nginx-ubuntu-trusty-nv
+      - gate-openstack-ansible-os_keystone-ansible-func_uwsgi_nginx-ubuntu-xenial-nv
+      - gate-openstack-ansible-os_keystone-ansible-func_uwsgi_apache-centos-7-nv
+      - gate-openstack-ansible-os_keystone-ansible-func_uwsgi_apache-ubuntu-trusty-nv
+      - gate-openstack-ansible-os_keystone-ansible-func_uwsgi_apache-ubuntu-xenial-nv
     release:
       - openstack-ansible-os_keystone-announce-release