Merge "Restrict generic inventory matchers to inventory/base"

zuul.d/infra-prod.yaml

@@ -115,7 +115,7 @@
     vars:
       playbook_name: service-bridge.yaml
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-bridge.yaml
       - inventory/service/host_vars/bridge.openstack.org.yaml
       - playbooks/roles/logrotate/
@@ -133,7 +133,7 @@
     vars:
       playbook_name: service-gitea-lb.yaml
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-gitea-lb.yaml
       - inventory/service/group_vars/gitea-lb.yaml
       - playbooks/roles/pip3/
@@ -148,7 +148,7 @@
     vars:
       playbook_name: service-nameserver.yaml
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-nameserver.yaml
       - inventory/service/host_vars/adns1.opendev.org.yaml
       - inventory/service/host_vars/ns1.opendev.org.yaml
@@ -169,7 +169,7 @@
       - opendev/system-config
       - openstack/project-config
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-nodepool.yaml
       - inventory/service/host_vars/nb
       - inventory/service/host_vars/nl
@@ -188,7 +188,7 @@
     vars:
       playbook_name: service-etherpad.yaml
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-etherpad.yaml
       - inventory/service/host_vars/etherpad01.opendev.org.yaml
       - inventory/service/group_vars/etherpad
@@ -211,7 +211,7 @@
     vars:
       playbook_name: service-meetpad.yaml
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-meetpad.yaml
       - inventory/service/host_vars/meetpad01.opendev.org.yaml
       - inventory/service/group_vars/meetpad.yaml
@@ -227,7 +227,9 @@
     vars:
       playbook_name: service-mirror-update.yaml
     files:
-      - inventory/
+      - inventory/base
+      - inventory/service/group_vars/mirror.yaml
+      - inventory/service/host_vars/mirror
       - playbooks/service-mirror-update.yaml
       - playbooks/roles/mirror-update/
       - playbooks/roles/reprepro/
@@ -243,8 +245,9 @@
     vars:
       playbook_name: service-mirror.yaml
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-mirror.yaml
+      - inventory/service/host_vars/mirror
       - inventory/service/group_vars/mirror.yaml
       - playbooks/roles/mirror/
       - playbooks/roles/afs-release/
@@ -260,7 +263,7 @@
     vars:
       playbook_name: service-paste.yaml
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-paste.yaml
       - inventory/service/host_vars/paste01.opendev.org.yaml
       - inventory/service/group_vars/paste
@@ -276,7 +279,7 @@
     vars:
       playbook_name: service-static.yaml
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-static.yaml
       - inventory/service/host_vars/static01.opendev.org.yaml
       - inventory/service/group_vars/static.yaml
@@ -292,7 +295,7 @@
     vars:
       playbook_name: service-borg-backup.yaml
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-borg-backup.yaml
       - playbooks/roles/install-borg/
       - playbooks/roles/borg-backup/
@@ -306,7 +309,7 @@
     vars:
       playbook_name: service-registry.yaml
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-registry.yaml
       - inventory/service/group_vars/registry.yaml
       - playbooks/roles/pip3/
@@ -321,7 +324,7 @@
     vars:
       playbook_name: service-zuul-preview.yaml
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-zuul-preview.yaml
       - inventory/service/group_vars/zuul-preview.yaml
       - playbooks/roles/pip3/
@@ -336,7 +339,7 @@
     vars:
       playbook_name: service-zookeeper.yaml
     files:
-      - inventory/.*
+      - inventory/base
       - inventory/service/group_vars/zookeeper.yaml
       - ^inventory/service/host_vars/zk\d+\..*
       - playbooks/roles/pip3/
@@ -363,7 +366,7 @@
       - name: infra-prod-manage-projects
         soft: true
     files:
-      - inventory/.*
+      - inventory/base
       - playbooks/install-ansible.yaml
       - playbooks/service-zuul.yaml
       - inventory/service/group_vars/zuul
@@ -391,7 +394,7 @@
       - name: system-config-promote-image-gerrit-3.2
         soft: true
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-review.yaml
       - inventory/service/group_vars/gerrit.yaml
       - inventory/service/host_vars/review01.openstack.org.yaml
@@ -414,7 +417,7 @@
       - name: system-config-promote-image-refstack
         soft: true
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-refstack.yaml
       - inventory/service/group_vars/
       - inventory/service/host_vars/refstack[0-9][0-9]
@@ -442,7 +445,7 @@
       - name: system-config-promote-image-gitea
         soft: true
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-gitea.yaml
       - inventory/service/group_vars/gitea.yaml
       - inventory/service/host_vars/gitea[0-9][0-9]
@@ -477,7 +480,7 @@
     vars:
       playbook_name: service-eavesdrop.yaml
     files: &infra_prod_eavesdrop_files
-      - inventory/
+      - inventory/base
       - playbooks/service-eavesdrop.yaml
       - playbooks/run-accessbot.yaml
       - inventory/service/group_vars/eavesdrop.yaml
@@ -519,7 +522,7 @@
       playbook_name: service-codesearch.yaml
     files:
       - docker/hound/
-      - inventory/
+      - inventory/base
       - playbooks/service-codesearch.yaml
       - inventory/service/host_vars/codesearch01.opendev.yaml
       - inventory/service/group_vars/codesearch
@@ -536,7 +539,7 @@
     vars:
       playbook_name: service-grafana.yaml
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-grafana.yaml
       - inventory/service/host_vars/grafana01.org.yaml
       - inventory/service/group_vars/grafana
@@ -553,7 +556,7 @@
     vars:
       playbook_name: service-graphite.yaml
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-graphite.yaml
       - inventory/service/host_vars/graphite02.opendev.org.yaml
       - inventory/service/group_vars/graphite
@@ -569,7 +572,7 @@
     vars:
       playbook_name: service-lists.yaml
     files:
-      - inventory/
+      - inventory/base
       - inventory/service/host_vars/lists.openstack.org.yaml
       - inventory/service/host_vars/lists.katacontainers.io.yaml
       - playbooks/roles/iptables/
@@ -589,7 +592,7 @@
     required-projects:
       - opendev/system-config
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-afs.yaml
       - inventory/service/group_vars/afs
       - inventory/service/group_vars/mirror-update
@@ -611,7 +614,7 @@
     required-projects:
       - opendev/system-config
     files:
-      - inventory/
+      - inventory/base
       - playbooks/service-kerberos.yaml
       - inventory/service/group_vars/kerberos-kdc.yaml
       - playbooks/roles/kerberos-kdc/