From a3a571b1133d195db701888f1c33bcab1bdd58f3 Mon Sep 17 00:00:00 2001
From: Mark Chappell <mchappel@redhat.com>
Date: Thu, 2 Apr 2020 14:27:09 +0200
Subject: [PATCH] Run Ansible-test from the devel ansible branch

In addition to running ansible-test from stable it's helpful to run
ansible-test from 'devel' where new sanity tests will land.  These
sanity tests are generally applicable to existing modules, but aren't
back-ported.

Change-Id: I8df3dd43cbc4cba643d7860e77a1089c15f5f092
Depends-On: https://review.opendev.org/717118
---
 .zuul.yaml | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 01e983dc..1aace752 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -41,7 +41,6 @@
     description: |
       Run openstack collections functional tests against a master devstack
       using master of openstacksdk and stable 2.9 branch of ansible
-    # non-voting because we can't prevent ansible devel from breaking us
     voting: true
     required-projects:
       - name: github.com/ansible/ansible
@@ -69,7 +68,6 @@
     description: |
       Run openstack collections functional tests against a train devstack
       using train brach of openstacksdk and stable 2.9 branch of ansible
-    # non-voting because we can't prevent ansible devel from breaking us
     voting: true
     required-projects:
       - name: github.com/ansible/ansible
@@ -101,7 +99,6 @@
     description: |
       Run openstack collections functional tests against a stein devstack
       using stein brach of openstacksdk and stable 2.9 branch of ansible
-    # non-voting because we can't prevent ansible devel from breaking us
     voting: true
     required-projects:
       - name: github.com/ansible/ansible
@@ -133,7 +130,6 @@
     description: |
       Run openstack collections functional tests against a rocky devstack
       using rocky brach of openstacksdk and stable 2.9 branch of ansible
-    # non-voting because we can't prevent ansible devel from breaking us
     voting: true
     required-projects:
       - name: github.com/ansible/ansible
@@ -143,15 +139,37 @@
       - name: openstack/devstack
         override-checkout: rocky
 
+- job:
+    name: openstack-tox-linters-ansible-devel
+    parent: openstack-tox-linters
+    description: |
+      Run openstack collections linter tests using the devel branch of ansible
+    # non-voting because we can't prevent ansible devel from breaking us
+    voting: false
+    required-projects:
+      - name: github.com/ansible/ansible
+        override-checkout: devel
+
+- job:
+    name: openstack-tox-linters-ansible-2.9
+    parent: openstack-tox-linters
+    description: |
+      Run openstack collections linter tests using the 2.9 branch of ansible
+    voting: true
+    required-projects:
+      - name: github.com/ansible/ansible
+        override-checkout: stable-2.9
+
 - project:
     check:
       jobs:
         - tox-pep8
-        - openstack-tox-linters
+        - openstack-tox-linters-ansible-devel
+        - openstack-tox-linters-ansible-2.9
         - ansible-collections-openstack-functional-devstack:
             dependencies: &deps_unit_lint
               - tox-pep8
-              - openstack-tox-linters
+              - openstack-tox-linters-ansible-2.9
         - ansible-collections-openstack-functional-devstack-releases:
             dependencies: *deps_unit_lint
         - ansible-collections-openstack-functional-devstack-ansible-devel: