From c0144eab68f3164553a015f528d9674cfed54223 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 3 Mar 2021 13:41:56 +1100 Subject: [PATCH] Fix up openafs-client job matching The jobs should have file matchers for "roles/openafs-client" (not playbooks/). Fix this. Add the openafs/kerberos role matchers to Zuul as well, as it uses them on the executors. Change-Id: I66fd7792d6b533362606291e1bfc01dfa2a2e05b --- zuul.d/infra-prod.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml index d5b1698342..773d5a4aac 100644 --- a/zuul.d/infra-prod.yaml +++ b/zuul.d/infra-prod.yaml @@ -233,12 +233,12 @@ files: - inventory/ - playbooks/service-mirror-update.yaml - - playbooks/roles/kerberos-client/ - - playbooks/roles/openafs-client/ - playbooks/roles/mirror-update/ - playbooks/roles/reprepro/ - playbooks/roles/iptables/ - playbooks/roles/logrotate/ + - roles/kerberos-client/ + - roles/openafs-client/ - job: name: infra-prod-service-mirror @@ -250,13 +250,12 @@ - inventory/ - playbooks/service-mirror.yaml - inventory/service/group_vars/mirror.yaml - - playbooks/roles/kerberos-client/ - - playbooks/roles/openafs-client/ - playbooks/roles/mirror/ - playbooks/roles/afs-release/ - playbooks/roles/afsmon/ - playbooks/roles/iptables/ - playbooks/roles/logrotate/ + - roles/openafs-client/ - job: name: infra-prod-service-static @@ -270,10 +269,9 @@ - inventory/service/host_vars/static01.opendev.org.yaml - inventory/service/group_vars/static.yaml - playbooks/roles/iptables/ - - playbooks/roles/kerberos-client/ - - playbooks/roles/openafs-client/ - playbooks/roles/static/ - playbooks/roles/zuul-user/ + - roles/openafs-client/ - job: name: infra-prod-service-borg-backup @@ -364,6 +362,8 @@ - playbooks/roles/iptables/ - playbooks/roles/zookeeper/ - playbooks/roles/zuul + - roles/kerberos-client/ + - roles/openafs-client/ - job: name: infra-prod-service-review @@ -592,6 +592,8 @@ - playbooks/roles/openafs-server/ - modules/ - manifests/ + - roles/kerberos-client/ + - roles/openafs-client/ - job: name: infra-prod-remote-puppet-else