openstack/kolla-ansible
Code Issues Proposed changes

CI: Add pre/run.yml to files in all base jobs

Browse Source 
Rework the base jobs structure to include a mid-level
kolla-ansible-scenario-base that includes common
files: stanza.

Change-Id: I548b22b27dff111d625361835029354557d8c9ca
This commit is contained in:
Michal Nasiadka 2024-10-31 11:38:35 +01:00
parent 9b98ce997e
commit 04873199ef
2 changed files with 45 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tox.ini
View File

@ -154,7 +154,7 @@ setenv = {[testenv:linters]setenv}
deps = {[testenv:linters]deps} deps = {[testenv:linters]deps}
commands = commands =
python {toxinidir}/tools/validate-all-file.py python {toxinidir}/tools/validate-all-file.py
ansible-lint -p --exclude {toxinidir}/tests --exclude {toxinidir}/roles --exclude {toxinidir}/etc ansible-lint -p --exclude tests --exclude roles --exclude etc --exclude zuul.d
[testenv:yamllint] [testenv:yamllint]
deps = {[testenv:linters]deps} deps = {[testenv:linters]deps}

114
zuul.d/base.yaml
View File

@ -74,13 +74,19 @@
- zuul: openstack/kolla - zuul: openstack/kolla
- job: - job:
name: kolla-ansible-kvm-base
parent: kolla-ansible-base parent: kolla-ansible-base
voting: false name: kolla-ansible-scenario-base
files: files:
- ^requirements-core.yml - ^requirements-core.yml
- ^ansible/roles/(nova-cell)/
- ^tests/templates/(inventory|globals-default.j2) - ^tests/templates/(inventory|globals-default.j2)
- ^tests/(pre|run).yml
- job:
name: kolla-ansible-kvm-base
parent: kolla-ansible-scenario-base
voting: false
files: !inherit
- ^ansible/roles/(nova-cell)/
- ^tests/templates/nova-compute-overrides.j2 - ^tests/templates/nova-compute-overrides.j2
vars: vars:
virt_type: kvm virt_type: kvm
@ -102,25 +108,21 @@
- job: - job:
name: kolla-ansible-bifrost-base name: kolla-ansible-bifrost-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/bifrost/ - ^ansible/roles/bifrost/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-bifrost.sh - ^tests/test-bifrost.sh
vars: vars:
scenario: bifrost scenario: bifrost
- job: - job:
name: kolla-ansible-ironic-base name: kolla-ansible-ironic-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(ironic|neutron|nova|nova-cell)/ - ^ansible/roles/(ironic|neutron|nova|nova-cell)/
- ^tests/deploy-tenks\.sh$ - ^tests/deploy-tenks\.sh$
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/templates/ironic-overrides\.j2$ - ^tests/templates/ironic-overrides\.j2$
- ^tests/templates/tenks-deploy-config\.yml\.j2$ - ^tests/templates/tenks-deploy-config\.yml\.j2$
- ^tests/test-dashboard\.sh$ - ^tests/test-dashboard\.sh$
@ -132,13 +134,11 @@
- job: - job:
name: kolla-ansible-zun-base name: kolla-ansible-zun-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(zun|kuryr|etcd|cinder|iscsi)/ - ^ansible/roles/(zun|kuryr|etcd|cinder|iscsi)/
- ^tests/setup_disks.sh - ^tests/setup_disks.sh
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-core-openstack.sh - ^tests/test-core-openstack.sh
- ^tests/test-zun.sh - ^tests/test-zun.sh
- ^tests/test-dashboard.sh - ^tests/test-dashboard.sh
@ -147,14 +147,12 @@
- job: - job:
name: kolla-ansible-swift-base name: kolla-ansible-swift-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(glance|swift)/ - ^ansible/roles/(glance|swift)/
- ^tests/setup_disks.sh - ^tests/setup_disks.sh
- ^tests/init-swift.sh - ^tests/init-swift.sh
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-core-openstack.sh - ^tests/test-core-openstack.sh
- ^tests/test-dashboard.sh - ^tests/test-dashboard.sh
- ^tests/test-swift.sh - ^tests/test-swift.sh
@ -170,12 +168,10 @@
- job: - job:
name: kolla-ansible-magnum-base name: kolla-ansible-magnum-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(designate|magnum|trove)/ - ^ansible/roles/(designate|magnum|trove)/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-dashboard.sh - ^tests/test-dashboard.sh
- ^tests/test-magnum.sh - ^tests/test-magnum.sh
vars: vars:
@ -183,12 +179,10 @@
- job: - job:
name: kolla-ansible-octavia-base name: kolla-ansible-octavia-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(octavia|octavia-certificates)/ - ^ansible/roles/(octavia|octavia-certificates)/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-dashboard.sh - ^tests/test-dashboard.sh
- ^tests/test-octavia.sh - ^tests/test-octavia.sh
vars: vars:
@ -196,13 +190,11 @@
- job: - job:
name: kolla-ansible-masakari-base name: kolla-ansible-masakari-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/masakari/ - ^ansible/roles/masakari/
- ^ansible/roles/hacluster/ - ^ansible/roles/hacluster/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-masakari.sh - ^tests/test-masakari.sh
- ^tests/test-dashboard.sh - ^tests/test-dashboard.sh
vars: vars:
@ -210,24 +202,20 @@
- job: - job:
name: kolla-ansible-mariadb-base name: kolla-ansible-mariadb-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: true voting: true
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/mariadb/ - ^ansible/roles/mariadb/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-mariadb.sh - ^tests/test-mariadb.sh
vars: vars:
scenario: mariadb scenario: mariadb
- job: - job:
name: kolla-ansible-scenario-nfv-base name: kolla-ansible-scenario-nfv-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(aodh|barbican|heat|mistral|redis|tacker)/ - ^ansible/roles/(aodh|barbican|heat|mistral|redis|tacker)/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-scenario-nfv.sh - ^tests/test-scenario-nfv.sh
- ^tests/test-dashboard.sh - ^tests/test-dashboard.sh
vars: vars:
@ -235,12 +223,10 @@
- job: - job:
name: kolla-ansible-cells-base name: kolla-ansible-cells-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/nova/ - ^ansible/roles/nova/
- ^tests/templates/(inventory|globals-default.j2)
- ^ansible/roles/loadbalancer/ - ^ansible/roles/loadbalancer/
- ^tests/test-core-openstack.sh - ^tests/test-core-openstack.sh
- ^tests/test-proxysql.sh - ^tests/test-proxysql.sh
@ -249,12 +235,10 @@
- job: - job:
name: kolla-ansible-ovn-base name: kolla-ansible-ovn-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(neutron|octavia|openvswitch|ovn-controller|ovn-db)/ - ^ansible/roles/(neutron|octavia|openvswitch|ovn-controller|ovn-db)/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-ovn.sh - ^tests/test-ovn.sh
- ^tests/test-core-openstack.sh - ^tests/test-core-openstack.sh
- ^tests/reconfigure.sh - ^tests/reconfigure.sh
@ -263,24 +247,20 @@
- job: - job:
name: kolla-ansible-prometheus-opensearch-base name: kolla-ansible-prometheus-opensearch-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(common|opensearch|grafana|prometheus)/ - ^ansible/roles/(common|opensearch|grafana|prometheus)/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-prometheus-opensearch.sh - ^tests/test-prometheus-opensearch.sh
vars: vars:
scenario: prometheus-opensearch scenario: prometheus-opensearch
- job: - job:
name: kolla-ansible-venus-base name: kolla-ansible-venus-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(common|opensearch|venus)/ - ^ansible/roles/(common|opensearch|venus)/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-venus.sh - ^tests/test-venus.sh
vars: vars:
scenario: venus scenario: venus
@ -295,19 +275,19 @@
voting: false voting: false
files: files:
- ^requirements-core.yml - ^requirements-core.yml
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/(pre|run).yml
- ^kolla_ansible/ - ^kolla_ansible/
- ^tests/run-hashi-vault.yml - ^tests/run-hashi-vault.yml
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-hashicorp-vault-passwords.sh - ^tests/test-hashicorp-vault-passwords.sh
- job: - job:
name: kolla-ansible-haproxy-base name: kolla-ansible-haproxy-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^ansible/roles/haproxy/ - ^ansible/roles/haproxy/
- ^kolla_ansible/kolla_url.py - ^kolla_ansible/kolla_url.py
- ^tests/templates/(inventory|globals-default.j2)
vars: vars:
external_api_interface_name: vxlan2 external_api_interface_name: vxlan2
external_api_network_prefix: "192.0.3." external_api_network_prefix: "192.0.3."
@ -317,13 +297,11 @@
- job: - job:
name: kolla-ansible-lets-encrypt-base name: kolla-ansible-lets-encrypt-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/common/templates/conf/input/11-letsencrypt.conf.j2 - ^ansible/roles/common/templates/conf/input/11-letsencrypt.conf.j2
- ^ansible/roles/(letsencrypt|loadbalancer)/ - ^ansible/roles/(letsencrypt|loadbalancer)/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-core-openstack.sh - ^tests/test-core-openstack.sh
- ^tests/test-dashboard.sh - ^tests/test-dashboard.sh
- ^tests/deploy.sh - ^tests/deploy.sh
@ -334,24 +312,20 @@
- job: - job:
name: kolla-ansible-skyline-base name: kolla-ansible-skyline-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/skyline/ - ^ansible/roles/skyline/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-skyline.sh - ^tests/test-skyline.sh
vars: vars:
scenario: skyline scenario: skyline
- job: - job:
name: kolla-ansible-skyline-sso-base name: kolla-ansible-skyline-sso-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files:
- ^requirements-core.yml
- ^ansible/roles/skyline/ - ^ansible/roles/skyline/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-skyline-sso.sh - ^tests/test-skyline-sso.sh
vars: vars:
scenario: skyline-sso scenario: skyline-sso