From 01d3b42a060af1027e2bb0d7bbe3c53979056d7e Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 1 Dec 2017 10:13:05 -0600
Subject: [PATCH] Make py27 and py35 versions and template of unit-tips jobs

Make py27 and py35 versions of the tips job, and a project-template to
hold them so it's easy for other projects to use both (or more, we ever
add them) The base tox job knows how to install siblings based on
required-projects, which makes it easy to piggyback on them.

Remove the irrelevant-files sections, as these are specified in the
base openstack-tox jobs.

Using the unit-tips or functional-tips tox env is no longer neccessary.
For the gate it's actually important to not do the sibling processing by
hand in tox as the base tox job version of the logic does all the
right things to deal with constraints and whatnot. Leave them for local
developer convenience.

Leave the osc-tox-unit-tips job for now, since there are some other
repos using it. Once we switch them to the template, we can remove the
job.

Change-Id: I599b18218c10cb08e508cca3b3bbc9c88b8f809c
---
 .zuul.yaml | 69 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 57 insertions(+), 12 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index dd00db2a01..98446e6870 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,12 +4,50 @@
     description: |
       Run unit tests for OpenStackClient with master branch of important libs.
 
-      Uses tox with the ``unit-tips`` environment and master branch of
-      the required-projects below.
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^releasenotes/.*$
+      Takes advantage of the base tox job's install-siblings feature.
+    required-projects:
+      - openstack/cliff
+      - openstack/keystoneauth
+      - openstack/os-client-config
+      - openstack/osc-lib
+      - openstack/python-openstackclient
+      - openstack/python-openstacksdk
+    vars:
+      tox_envlist: py27
+      # Set work dir to openstackclient so that if it's triggered by one of the
+      # other repos the tests will run in the same place
+      zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient
+
+- job:
+    name: osc-tox-py27-tips
+    parent: openstack-tox-py27
+    description: |
+      Run unit tests for OpenStackClient with master branch of important libs.
+
+      Takes advantage of the base tox job's install-siblings feature.
+    # The job only tests the latest and shouldn't be run on the stable branches
+    branches: ^(?!stable)
+    required-projects:
+      - openstack/cliff
+      - openstack/keystoneauth
+      - openstack/os-client-config
+      - openstack/osc-lib
+      - openstack/python-openstackclient
+      - openstack/python-openstacksdk
+    vars:
+      # Set work dir to openstackclient so that if it's triggered by one of the
+      # other repos the tests will run in the same place
+      zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient
+
+- job:
+    name: osc-tox-py35-tips
+    parent: openstack-tox-py35
+    description: |
+      Run unit tests for OpenStackClient with master branch of important libs.
+
+      Takes advantage of the base tox job's install-siblings feature.
+    # The job only tests the latest and shouldn't be run on the stable branches
+    branches: ^(?!stable)
     required-projects:
       - openstack/cliff
       - openstack/keystoneauth
@@ -18,7 +56,6 @@
       - openstack/python-openstackclient
       - openstack/python-openstacksdk
     vars:
-      tox_envlist: unit-tips
       # Set work dir to openstackclient so that if it's triggered by one of the
       # other repos the tests will run in the same place
       zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient
@@ -137,18 +174,26 @@
         s-container: false
         s-object: false
         s-proxy: false
-      tox_envlist: functional-tips
+      tox_envlist: functional
+
+- project-template:
+    name: osc-tox-unit-tips
+    check:
+      jobs:
+        - osc-tox-py27-tips
+        - osc-tox-py35-tips
+    gate:
+      jobs:
+        - osc-tox-py27-tips
+        - osc-tox-py35-tips
 
 - project:
     name: openstack/python-openstackclient
     templates:
       - openstackclient-plugin-jobs
+      - osc-tox-unit-tips
     check:
       jobs:
-        - osc-tox-unit-tips:
-            # The functional-tips job only tests the latest and shouldn't be run
-            # on the stable branches
-            branches: ^(?!stable)
         - osc-functional-devstack
         # - osc-functional-devstack-n-net:
         #     voting: false