From fb730473fad8e638bcedc2a7b2da19ec2a4c9a93 Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem.os@gmail.com>
Date: Thu, 28 Jun 2018 12:41:09 -0400
Subject: [PATCH] Define common variables for irrelevant-files

We can define common variables for irrelevant-files
used across various dsvm and functional jobs and then
reference them using node anchors to avoid duplication.

Change-Id: Ife046b91c96dd300e8c46125b75623d8e12b8da3
Co-Authored-By: Stephen Finucane <stephenfin@redhat.com>
---
 .zuul.yaml | 44 +++++---------------------------------------
 1 file changed, 5 insertions(+), 39 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index dca9da0c1cce..4f7dee155689 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -11,7 +11,7 @@
       - openstack-infra/devstack-gate
       - openstack/nova
       - openstack/tempest
-    irrelevant-files:
+    irrelevant-files: &dsvm-irrelevant-files
       - ^(placement-)?api-.*$
       - ^(test-|)requirements.txt$
       - ^.*\.rst$
@@ -38,20 +38,7 @@
       - openstack-infra/devstack-gate
       - openstack/nova
       - openstack/tempest
-    irrelevant-files:
-      - ^(placement-)?api-.*$
-      - ^(test-|)requirements.txt$
-      - ^.*\.rst$
-      - ^.git.*$
-      - ^doc/.*$
-      - ^nova/hacking/.*$
-      - ^nova/locale/.*$
-      - ^nova/tests/(?!live_migration).*$
-      - ^releasenotes/.*$
-      - ^setup.cfg$
-      - ^tests-py3.txt$
-      - ^tools/.*$
-      - ^tox.ini$
+    irrelevant-files: *dsvm-irrelevant-files
     nodeset: legacy-ubuntu-xenial-2-node
 
 - job:
@@ -61,7 +48,7 @@
       Run tox-based functional tests for the OpenStack Nova project with Nova
       specific irrelevant-files list. Uses tox with the ``functional``
       environment.
-    irrelevant-files:
+    irrelevant-files: &functional-irrelevant-files
       - ^.*\.rst$
       - ^api-.*$
       - ^doc/source/.*$
@@ -79,13 +66,7 @@
       Run tox-based functional tests for the OpenStack Nova project
       under cPython version 3.5. with Nova specific irrelevant-files list.
       Uses tox with the ``functional-py35`` environment.
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^api-.*$
-      - ^doc/source/.*$
-      - ^nova/locale/.*$
-      - ^placement-api-ref/.*$
-      - ^releasenotes/.*$
+    irrelevant-files: *functional-irrelevant-files
     vars:
       tox_envlist: functional-py35
     timeout: 3600
@@ -173,22 +154,7 @@
         # on things like nova docs-only changes.
         - ironic-tempest-dsvm-ipa-wholedisk-bios-agent_ipmitool-tinyipa:
             voting: false
-            # This irrelevant-files list should match nova-dsvm-base.
-            # TODO(mriedem): Define a node anchor to deduplicate this.
-            irrelevant-files:
-              - ^(placement-)?api-.*$
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^.git.*$
-              - ^doc/.*$
-              - ^nova/hacking/.*$
-              - ^nova/locale/.*$
-              - ^nova/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tests-py3.txt$
-              - ^tools/.*$
-              - ^tox.ini$
+            irrelevant-files: *dsvm-irrelevant-files
         - nova-cells-v1
         - nova-live-migration
         - nova-lvm