From beb07375694f2002ad1e938540eda96b984be22b Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sun, 15 Oct 2017 19:26:32 +0200
Subject: [PATCH] Limit multinode-integration, update base-integration

Limit when to run multinode integration.

Update base-integration for current tests.

Add notes to update the files section when updating.

Change-Id: I4e055511cb10113b93a0a18bab6d72aacf782e11
---
 tests/base.yaml      |  4 ++++
 tests/multinode.yaml |  4 ++++
 zuul.d/jobs.yaml     | 13 ++++++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/tests/base.yaml b/tests/base.yaml
index 7374f51c..e6446c27 100644
--- a/tests/base.yaml
+++ b/tests/base.yaml
@@ -1,4 +1,8 @@
 # Roles that are part of the 'base' job
+
+# If you add new tests, also update the files section in job
+# base-integration in zuul.d/jobs.yaml.
+
 - include: configure-unbound.yaml
 - include: mirror-info.yaml
 - include: configure-mirrors.yaml
diff --git a/tests/multinode.yaml b/tests/multinode.yaml
index 751d390a..2a32ea28 100644
--- a/tests/multinode.yaml
+++ b/tests/multinode.yaml
@@ -2,6 +2,10 @@
 - include: base.yaml
 
 # Roles that are part of the 'multinode' job
+
+# If you add new tests, also update the files section in jobs
+# base-integration and multinode-integration in zuul.d/jobs.yaml.
+
 - include: multi-node-known-hosts.yaml
 - include: multi-node-hosts-file.yaml
 - include: multi-node-firewall.yaml
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index b5b54613..f8e02f6d 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -14,8 +14,10 @@
     run: tests/base
     files:
       - ^roles/configure-mirror/.*
+      - ^roles/configure-unbound/.*
+      - ^roles/fetch-zuul-cloner/.*
       - ^roles/mirror-info/.*
-      - ^test/base.yaml
+      - ^tests/.*
 
 - job:
     name: base-integration-centos-7
@@ -56,6 +58,15 @@
     roles:
       - zuul: openstack-infra/zuul-jobs
     run: tests/multinode
+    files:
+      - ^roles/configure-mirror/.*
+      - ^roles/configure-unbound/.*
+      - ^roles/fetch-zuul-cloner/.*
+      - ^roles/mirror-info/.*
+      - ^roles/multi-node-firewall/.*
+      - ^roles/multi-node-hosts-file/.*
+      - ^roles/multi-node-known-hosts/.*
+      - ^tests/.*
 
 - job:
     name: multinode-integration-centos-7