Merge "Update Zuul triggers after group_vars split"

24 files changed, 110 insertions, 95 deletions

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 13db98ca6..4b241ead9 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -1,6 +1,47 @@
 ---
 - job:
-    name: kolla-ansible-variables
+    name: kolla-ansible-base
+    pre-run: tests/pre.yml
+    run: tests/run.yml
+    post-run: tests/post.yml
+    timeout: 9000
+    post-timeout: 1800
+    required-projects:
+      - openstack/ansible-collection-kolla
+      - openstack/kolla
+      - openstack/kolla-ansible
+      - openstack/requirements
+    files:
+      - ^ansible/group_vars/all/common.yml
+      - ^requirements-core.yml
+      - ^tests/check-(config|failure|logs).sh
+      - ^tests/get_logs.sh
+      - ^tests/init-core-openstack.sh
+      - ^tests/(run|pre|post).yml
+      - ^tests/setup_gate.sh
+      - ^tests/templates/(inventory|globals-default).j2
+      - ^tests/test-(core-openstack|dashboard|proxysql).sh
+      - ^tests/upgrade.sh
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^bindep.txt$
+      - ^doc/.*
+      - ^releasenotes/.*$
+      - ^deploy-guide/.*$
+      - ^test-requirements.txt$
+      - ^lint-requirements.txt$
+      - ^etc/kolla/globals.yml$
+      - ^tox.ini$
+      - ^\..+
+      - ^LICENSE$
+      - ^contrib/
+      - ^specs/
+      - ^kolla_ansible/tests/
+      - ^tools/validate-.*$
+      - ^zuul.d/
+    roles:
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/kolla
     vars:
       address_family: 'ipv4'
       # Test latest ansible-core version on Ubuntu, minimum supported on others.
@@ -53,48 +94,3 @@
         - ^rabbitmq
       tls_enabled: true
       virt_type: qemu
-
-- job:
-    parent: kolla-ansible-variables
-    name: kolla-ansible-base
-    pre-run: tests/pre.yml
-    run: tests/run.yml
-    post-run: tests/post.yml
-    timeout: 9000
-    post-timeout: 1800
-    required-projects:
-      - openstack/ansible-collection-kolla
-      - openstack/kolla
-      - openstack/kolla-ansible
-      - openstack/requirements
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^bindep.txt$
-      - ^doc/.*
-      - ^releasenotes/.*$
-      - ^deploy-guide/.*$
-      - ^test-requirements.txt$
-      - ^lint-requirements.txt$
-      - ^etc/kolla/globals.yml$
-      - ^tox.ini$
-      - ^\..+
-      - ^LICENSE$
-      - ^contrib/
-      - ^specs/
-      - ^kolla_ansible/tests/
-      - ^tools/validate-.*$
-    roles:
-      - zuul: zuul/zuul-jobs
-      - zuul: openstack/kolla
-
-- job:
-    parent: kolla-ansible-base
-    name: kolla-ansible-scenario-base
-    files:
-      - ^ansible/group_vars/all/(baremetal|common|fluentd|glance|heat|horizon|keepalived|keystone|loadbalancer|neutron|nova|openvswitch|placement|proxysql|rabbitmq).yml
-      - ^ansible/roles/common/
-      - ^requirements-core.yml
-      - ^tests/check-logs.sh
-      - ^tests/get_logs.sh
-      - ^tests/(pre|run).yml
-      - ^tests/templates/(inventory|globals-default.j2)
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index eccfdafd0..77e714e1a 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -12,6 +12,7 @@
       # https://review.opendev.org/c/openstack/kolla-ansible/+/864780
       # - kolla-ansible-scenario-container-engine-migration
       - kolla-ansible-scenario-haproxy-fqdn
+      - kolla-ansible-scenario-hashi-vault
       - kolla-ansible-scenario-kvm
       - kolla-ansible-scenario-lets-encrypt
       - kolla-ansible-scenario-magnum
diff --git a/zuul.d/scenarios/aio.yaml b/zuul.d/scenarios/aio.yaml
index 5b43461b2..360737ab5 100644
--- a/zuul.d/scenarios/aio.yaml
+++ b/zuul.d/scenarios/aio.yaml
@@ -1,7 +1,15 @@
 ---
 - job:
-    name: kolla-ansible-centos-10s
     parent: kolla-ansible-base
+    name: kolla-ansible-aio-base
+    files: !inherit
+      - ^ansible/group_vars/all/(common|fluentd|glance|haproxy|heat|horizon|keepalived|keystone|loadbalancer|neutron|nova|openvswitch|placement|proxysql|rabbitmq).yml
+      - ^ansible/group_vars/baremetal/ansible-python-interpreter.yml
+      - ^ansible/roles/(common|fluentd|glance|haproxy-config|heat|horizon|keystone|loadbalancer|loadbalancer-config|neutron|nova|openvswitch|placement|proxysql|rabbitmq)/
+
+- job:
+    name: kolla-ansible-centos-10s
+    parent: kolla-ansible-aio-base
     nodeset: kolla-ansible-centos-10s-8GB
     voting: false
     vars:
@@ -14,7 +22,7 @@
 
 - job:
     name: kolla-ansible-debian-bookworm
-    parent: kolla-ansible-base
+    parent: kolla-ansible-aio-base
     nodeset: kolla-ansible-debian-bookworm-16GB
 
 - job:
@@ -45,7 +53,7 @@
 
 - job:
     name: kolla-ansible-debian-bookworm-upgrade
-    parent: kolla-ansible-base
+    parent: kolla-ansible-aio-base
     nodeset: kolla-ansible-debian-bookworm-16GB
     timeout: 10800
 
@@ -63,7 +71,7 @@
 
 - job:
     name: kolla-ansible-ubuntu-noble
-    parent: kolla-ansible-base
+    parent: kolla-ansible-aio-base
     nodeset: kolla-ansible-ubuntu-noble-16GB
 
 - job:
@@ -75,13 +83,13 @@
 
 - job:
     name: kolla-ansible-ubuntu-noble-upgrade
-    parent: kolla-ansible-base
+    parent: kolla-ansible-aio-base
     nodeset: kolla-ansible-ubuntu-noble-16GB
     timeout: 10800
 
 - job:
     name: kolla-ansible-ubuntu-noble-upgrade-slurp
-    parent: kolla-ansible-base
+    parent: kolla-ansible-aio-base
     nodeset: kolla-ansible-ubuntu-noble-16GB
     timeout: 9000
 
diff --git a/zuul.d/scenarios/bifrost.yaml b/zuul.d/scenarios/bifrost.yaml
index 9c6690052..fd24a7901 100644
--- a/zuul.d/scenarios/bifrost.yaml
+++ b/zuul.d/scenarios/bifrost.yaml
@@ -1,9 +1,10 @@
 ---
 - job:
     name: kolla-ansible-bifrost-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
+      - ^ansible/group_vars/all/bifrost.yml
       - ^ansible/roles/bifrost/
       - ^tests/test-bifrost.sh
     vars:
diff --git a/zuul.d/scenarios/cells.yaml b/zuul.d/scenarios/cells.yaml
index ce061af6b..bec5a297c 100644
--- a/zuul.d/scenarios/cells.yaml
+++ b/zuul.d/scenarios/cells.yaml
@@ -1,14 +1,13 @@
 ---
 - job:
     name: kolla-ansible-cells-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
+      - ^ansible/group_vars/all/(baremetal|common|fluentd|glance|heat|horizon|keepalived|keystone|loadbalancer|neutron|nova|openvswitch|placement|proxysql|rabbitmq|sysctl).yml
       - ^ansible/roles/nova/
       - ^ansible/roles/nova-cell/
       - ^ansible/roles/loadbalancer/
-      - ^tests/test-core-openstack.sh
-      - ^tests/test-proxysql.sh
     vars:
       scenario: cells
       scenario_images_extra:
diff --git a/zuul.d/scenarios/cephadm.yaml b/zuul.d/scenarios/cephadm.yaml
index 7e5528e79..9d3bf69f2 100644
--- a/zuul.d/scenarios/cephadm.yaml
+++ b/zuul.d/scenarios/cephadm.yaml
@@ -3,6 +3,11 @@
     name: kolla-ansible-cephadm-base
     parent: kolla-ansible-base
     voting: false
+    files:
+      - ^ansible/group_vars/all/(ceph|ceph-rgw|common|fluentd|glance|heat|horizon|keepalived|keystone|loadbalancer|neutron|nova|openvswitch|placement|proxysql|rabbitmq).yml
+      - ^ansible/group_vars/baremetal/ansible-python-interpreter.yml
+      - ^ansible/roles/(ceph-rgw|common|fluentd|glance|haproxy-config|heat|horizon|keystone|loadbalancer|loadbalancer-config|neutron|nova|openvswitch|placement|proxysql|rabbitmq)/
+      - ^roles/cephadm/
     vars:
       scenario: cephadm
       scenario_images_extra:
diff --git a/zuul.d/scenarios/container-engine-migration.yaml b/zuul.d/scenarios/container-engine-migration.yaml
index f64cc7296..c57aaa23a 100644
--- a/zuul.d/scenarios/container-engine-migration.yaml
+++ b/zuul.d/scenarios/container-engine-migration.yaml
@@ -3,7 +3,7 @@
     name: kolla-ansible-container-engine-migration-base
     parent: kolla-ansible-base
     voting: false
-    files:
+    files: !inherit
       - ^ansible/migrate-container-engine.yml
       - ^ansible/roles/container-engine-migration/
       - ^tests/test-container-engine-migration.sh
diff --git a/zuul.d/scenarios/haproxy-fqdn.yaml b/zuul.d/scenarios/haproxy-fqdn.yaml
index 672d7a8b5..dac1687c4 100644
--- a/zuul.d/scenarios/haproxy-fqdn.yaml
+++ b/zuul.d/scenarios/haproxy-fqdn.yaml
@@ -1,11 +1,11 @@
 ---
 - job:
     name: kolla-ansible-haproxy-fqdn-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
-      - ^ansible/roles/haproxy/
-      - ^ansible/roles/loadbalancer/
+      - ^ansible/group_vars/haproxy.yml
+      - ^ansible/roles/(haproxy|haproxy-config|loadbalancer|loadbalancer-config)/
       - ^kolla_ansible/kolla_url.py
     vars:
       external_api_interface_name: vxlan2
diff --git a/zuul.d/scenarios/hashi-vault.yaml b/zuul.d/scenarios/hashi-vault.yaml
index 74c92c445..468751bad 100644
--- a/zuul.d/scenarios/hashi-vault.yaml
+++ b/zuul.d/scenarios/hashi-vault.yaml
@@ -1,18 +1,17 @@
 ---
 - job:
     name: kolla-ansible-hashi-vault-base
-    parent: kolla-ansible-variables
+    parent: kolla-ansible-base
     run: tests/run-hashi-vault.yml
     required-projects:
       - openstack/kolla-ansible
       - openstack/requirements
     voting: false
-    files:
-      - ^requirements-core.yml
-      - ^tests/templates/(inventory|globals-default.j2)
-      - ^tests/(pre|run).yml
+    files: !override
       - ^kolla_ansible/
-      - ^tests/run-hashi-vault.yml
+      - ^requirements-core.yml
+      - ^tests/(pre|run|run-hashi-vault).yml
+      - ^tests/templates/(inventory|globals-default).j2
       - ^tests/test-hashicorp-vault-passwords.sh
 
 - job:
diff --git a/zuul.d/scenarios/ipv6.yaml b/zuul.d/scenarios/ipv6.yaml
index e45bf0cd6..c5a9d3e39 100644
--- a/zuul.d/scenarios/ipv6.yaml
+++ b/zuul.d/scenarios/ipv6.yaml
@@ -1,7 +1,7 @@
 ---
 - job:
     name: kolla-ansible-ipv6-base
-    parent: kolla-ansible-base
+    parent: kolla-ansible-aio-base
     voting: false
     vars:
       address_family: 'ipv6'
diff --git a/zuul.d/scenarios/ironic.yaml b/zuul.d/scenarios/ironic.yaml
index fbe177ff3..63b642e7f 100644
--- a/zuul.d/scenarios/ironic.yaml
+++ b/zuul.d/scenarios/ironic.yaml
@@ -1,10 +1,11 @@
 ---
 - job:
     name: kolla-ansible-ironic-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
-      - ^ansible/roles/(ironic|neutron|nova|nova-cell)/
+      - ^ansible/group_vars/all/(nova|ironic).yml
+      - ^ansible/roles/(nova|nova-cell|ironic)/
       - ^tests/deploy-tenks\.sh$
       - ^tests/templates/ironic-overrides\.j2$
       - ^tests/templates/tenks-deploy-config\.yml\.j2$
diff --git a/zuul.d/scenarios/kvm.yaml b/zuul.d/scenarios/kvm.yaml
index 829021ad3..1f4a034eb 100644
--- a/zuul.d/scenarios/kvm.yaml
+++ b/zuul.d/scenarios/kvm.yaml
@@ -1,10 +1,10 @@
 ---
 - job:
     name: kolla-ansible-kvm-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
-      - ^ansible/roles/(nova-cell)/
+      - ^ansible/roles/nova-cell/
       - ^tests/templates/nova-compute-overrides.j2
     vars:
       virt_type: kvm
diff --git a/zuul.d/scenarios/lets-encrypt.yaml b/zuul.d/scenarios/lets-encrypt.yaml
index 54d054d45..a985cae64 100644
--- a/zuul.d/scenarios/lets-encrypt.yaml
+++ b/zuul.d/scenarios/lets-encrypt.yaml
@@ -1,11 +1,12 @@
 ---
 - job:
     name: kolla-ansible-lets-encrypt-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
-      - ^ansible/roles/common/templates/conf/input/11-letsencrypt.conf.j2
-      - ^ansible/roles/(letsencrypt|loadbalancer)/
+      - ^ansible/group_vars/all/lets-encrypt.yml
+      - ^ansible/roles/fluentd/templates/conf/input/11-letsencrypt.conf.j2
+      - ^ansible/roles/(haproxy-config|letsencrypt|loadbalancer|loadbalancer-config)/
       - ^tests/test-core-openstack.sh
       - ^tests/test-dashboard.sh
       - ^tests/deploy.sh
diff --git a/zuul.d/scenarios/magnum.yaml b/zuul.d/scenarios/magnum.yaml
index cd19d79a0..18df9700a 100644
--- a/zuul.d/scenarios/magnum.yaml
+++ b/zuul.d/scenarios/magnum.yaml
@@ -1,9 +1,10 @@
 ---
 - job:
     name: kolla-ansible-magnum-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
+      - ^ansible/group_vars/all/(designate|magnum|trove).yml
       - ^ansible/roles/(designate|magnum|trove)/
       - ^tests/test-dashboard.sh
       - ^tests/test-magnum.sh
diff --git a/zuul.d/scenarios/mariadb.yaml b/zuul.d/scenarios/mariadb.yaml
index 776a9999c..23cad5491 100644
--- a/zuul.d/scenarios/mariadb.yaml
+++ b/zuul.d/scenarios/mariadb.yaml
@@ -1,10 +1,11 @@
 ---
 - job:
     name: kolla-ansible-mariadb-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: true
     files: !inherit
-      - ^ansible/roles/(loadbalancer|mariadb|proxysql-config)/
+      - ^ansible/group_vars/all/mariadb.yml
+      - ^ansible/roles/(loadbalancer|loadbalancer-config|mariadb|proxysql-config)/
       - ^tests/test-mariadb.sh
     vars:
       scenario: mariadb
diff --git a/zuul.d/scenarios/masakari.yaml b/zuul.d/scenarios/masakari.yaml
index ed6182b8b..4aab449de 100644
--- a/zuul.d/scenarios/masakari.yaml
+++ b/zuul.d/scenarios/masakari.yaml
@@ -1,13 +1,12 @@
 ---
 - job:
     name: kolla-ansible-masakari-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
-      - ^ansible/roles/masakari/
-      - ^ansible/roles/hacluster/
+      - ^ansible/group_vars/all/(hacluster|masakari).yml
+      - ^ansible/roles/(hacluster|masakari)/
       - ^tests/test-masakari.sh
-      - ^tests/test-dashboard.sh
     vars:
       scenario: masakari
       scenario_images_extra:
diff --git a/zuul.d/scenarios/nfv.yaml b/zuul.d/scenarios/nfv.yaml
index 0d8145cc7..60e44f7ee 100644
--- a/zuul.d/scenarios/nfv.yaml
+++ b/zuul.d/scenarios/nfv.yaml
@@ -1,12 +1,12 @@
 ---
 - job:
     name: kolla-ansible-scenario-nfv-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
+      - ^ansible/group_vars/all/(aodh|barbican|heat|mistral|redis|tacker).yml
       - ^ansible/roles/(aodh|barbican|heat|mistral|redis|tacker)/
       - ^tests/test-scenario-nfv.sh
-      - ^tests/test-dashboard.sh
     vars:
       scenario: nfv
       scenario_images_extra:
diff --git a/zuul.d/scenarios/octavia.yaml b/zuul.d/scenarios/octavia.yaml
index 8b85f132d..d7fdcb208 100644
--- a/zuul.d/scenarios/octavia.yaml
+++ b/zuul.d/scenarios/octavia.yaml
@@ -1,11 +1,11 @@
 ---
 - job:
     name: kolla-ansible-octavia-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
+      - ^ansible/group_vars/all/octavia.yml
       - ^ansible/roles/(octavia|octavia-certificates)/
-      - ^tests/test-dashboard.sh
       - ^tests/test-octavia.sh
     vars:
       scenario: octavia
diff --git a/zuul.d/scenarios/ovn.yaml b/zuul.d/scenarios/ovn.yaml
index 9c68d3504..17a46c569 100644
--- a/zuul.d/scenarios/ovn.yaml
+++ b/zuul.d/scenarios/ovn.yaml
@@ -1,13 +1,12 @@
 ---
 - job:
     name: kolla-ansible-ovn-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
+      - ^ansible/group_vars/all/(neutron|octavia|openvswitch|ovn).yml
       - ^ansible/roles/(neutron|octavia|openvswitch|ovn-controller|ovn-db)/
       - ^tests/test-ovn.sh
-      - ^tests/test-core-openstack.sh
-      - ^tests/reconfigure.sh
     vars:
       scenario: ovn
       scenario_images_extra:
diff --git a/zuul.d/scenarios/prometheus-opensearch.yaml b/zuul.d/scenarios/prometheus-opensearch.yaml
index 9cd993849..481e663f3 100644
--- a/zuul.d/scenarios/prometheus-opensearch.yaml
+++ b/zuul.d/scenarios/prometheus-opensearch.yaml
@@ -1,10 +1,10 @@
 ---
 - job:
     name: kolla-ansible-prometheus-opensearch-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
-      - ^ansible/site.yml
+      - ^ansible/group_vars/all/(common|grafana|opensearch|prometheus).yml
       - ^ansible/roles/(common|opensearch|grafana|prometheus)/
       - ^tests/test-prometheus-opensearch.sh
     vars:
diff --git a/zuul.d/scenarios/skyline.yaml b/zuul.d/scenarios/skyline.yaml
index c25bbdd96..6bacdf2b9 100644
--- a/zuul.d/scenarios/skyline.yaml
+++ b/zuul.d/scenarios/skyline.yaml
@@ -1,9 +1,10 @@
 ---
 - job:
     name: kolla-ansible-skyline-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
+      - ^ansible/group_vars/all/skyline.yml
       - ^ansible/roles/skyline/
       - ^tests/test-skyline.sh
     vars:
diff --git a/zuul.d/scenarios/telemetry.yaml b/zuul.d/scenarios/telemetry.yaml
index ec20cd708..05c1d4fb7 100644
--- a/zuul.d/scenarios/telemetry.yaml
+++ b/zuul.d/scenarios/telemetry.yaml
@@ -1,9 +1,10 @@
 ---
 - job:
     name: kolla-ansible-telemetry-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files:
+      - ^ansible/group_vars/all/(aodh|ceilometer|gnocchi).yml
       - ^ansible/roles/(aodh|ceilometer|gnocchi)/
       - ^tests/test-telemetry.sh
     vars:
diff --git a/zuul.d/scenarios/venus.yaml b/zuul.d/scenarios/venus.yaml
index 579aaca6f..f933304c7 100644
--- a/zuul.d/scenarios/venus.yaml
+++ b/zuul.d/scenarios/venus.yaml
@@ -1,10 +1,11 @@
 ---
 - job:
     name: kolla-ansible-venus-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
-      - ^ansible/roles/(common|opensearch|venus)/
+      - ^ansible/group_vars/all/(fluentd|opensearch|venus).yml
+      - ^ansible/roles/(fluentd|opensearch|venus)/
       - ^tests/test-venus.sh
     vars:
       scenario: venus
diff --git a/zuul.d/scenarios/zun.yaml b/zuul.d/scenarios/zun.yaml
index 8367103ad..6ef8a9c60 100644
--- a/zuul.d/scenarios/zun.yaml
+++ b/zuul.d/scenarios/zun.yaml
@@ -1,9 +1,10 @@
 ---
 - job:
     name: kolla-ansible-zun-base
-    parent: kolla-ansible-scenario-base
+    parent: kolla-ansible-base
     voting: false
     files: !inherit
+      - ^ansible/group_vars/all/(zun|kuryr|etcd|cinder|iscsi).yml
       - ^ansible/roles/(zun|kuryr|etcd|cinder|iscsi)/
       - ^tests/setup_disks.sh
       - ^tests/test-core-openstack.sh