From b61366f4f0ecd9eb6d7b0a4a7fa9ed0f810fca44 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 3 Feb 2018 17:14:56 +0100
Subject: [PATCH] Convert ansible-role-functional jobs

All repositories using these tests have a functional tox environment, so
use the default tox functional jobs for these.

Create new variants for testing on Fedora and CentOS.

Change the project-templates to use the new jobs and
move the now native templates to project-templates files.

Needed-By: https://review.openstack.org/540602
Change-Id: I1abca098710fc348fbfa66180fcdd43b54327687
---
 zuul.d/jobs.yaml                          | 22 +++++++++++
 zuul.d/project-templates.yaml             | 46 +++++++++++++++++++++++
 zuul.d/zuul-legacy-project-templates.yaml | 34 -----------------
 3 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ecc31ea0..4ca767ae 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -397,6 +397,28 @@
     vars:
       tox_envlist: functional
 
+- job:
+    name: openstack-tox-functional-centos-7
+    parent: openstack-tox-functional
+    description: |
+      Run tox-based functional tests for an OpenStack Python project.
+
+      Uses tox with the ``functional`` environment.
+
+      Runs on CentOS 7 node.
+    nodeset: centos-7
+
+- job:
+    name: openstack-tox-functional-fedora-26
+    parent: openstack-tox-functional
+    description: |
+      Run tox-based functional tests for an OpenStack Python project.
+
+      Uses tox with the ``functional`` environment.
+
+      Runs on a Fedora 26 node.
+    nodeset: fedora-26
+
 - job:
     name: openstack-tox-functional-py35
     parent: openstack-tox
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 3c4b84a7..d66703d1 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -912,3 +912,49 @@
     gate:
       jobs:
         - openstack-tox-snap-with-sudo
+
+- project-template:
+    name: ansible-role-functional-jobs-centos7
+    description: |
+      Run functional tests on ansible-role repositories using
+      CentOS 7 nodes.
+    check:
+      jobs:
+        - openstack-tox-functional-centos-7
+    gate:
+      jobs:
+        - openstack-tox-functional-centos-7
+
+- project-template:
+    name: ansible-role-functional-jobs-fedora-26
+    description: |
+      Run functional tests on ansible-role repositories using
+      Fedora 26 nodes.
+    check:
+      jobs:
+        - openstack-tox-functional-fedora-26
+    gate:
+      jobs:
+        - openstack-tox-functional-fedora-26
+
+- project-template:
+    name: ansible-role-functional-jobs-xenial
+    description: |
+      Run functional tests on ansible-role repositories using
+      Ubuntu Xenial nodes.
+    check:
+      jobs:
+        - openstack-tox-functional
+    gate:
+      jobs:
+        - openstack-tox-functional
+
+- project-template:
+    name: ansible-role-functional-jobs-xenial-nv
+    description: |
+      Run functional tests on ansible-role repositories using
+      Ubuntu Xenial nodes. The tests are non-voting.
+    check:
+      jobs:
+        - openstack-tox-functional:
+            voting: false
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index 6a408bf6..ab7a6a89 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -7,40 +7,6 @@
       jobs:
         - legacy-ansible-lint
 
-- project-template:
-    name: ansible-role-functional-jobs-centos7
-    check:
-      jobs:
-        - legacy-ansible-func-centos-7
-    gate:
-      jobs:
-        - legacy-ansible-func-centos-7
-
-- project-template:
-    name: ansible-role-functional-jobs-fedora-26
-    check:
-      jobs:
-        - legacy-ansible-func-fedora-26
-    gate:
-      jobs:
-        - legacy-ansible-func-fedora-26
-
-- project-template:
-    name: ansible-role-functional-jobs-xenial
-    check:
-      jobs:
-        - legacy-ansible-func
-    gate:
-      jobs:
-        - legacy-ansible-func
-
-- project-template:
-    name: ansible-role-functional-jobs-xenial-nv
-    check:
-      jobs:
-        - legacy-ansible-func:
-            voting: false
-
 - project-template:
     name: fuel-ccp-component
     check: