diff options
Diffstat (limited to 'zuul.d')
| -rw-r--r-- | zuul.d/base.yaml | 11 | ||||
| -rw-r--r-- | zuul.d/project.yaml | 4 | ||||
| -rw-r--r-- | zuul.d/python3-jobs.yaml | 23 | ||||
| -rw-r--r-- | zuul.d/scenarios/aio.yaml | 6 | ||||
| -rw-r--r-- | zuul.d/scenarios/cephadm.yaml | 6 | ||||
| -rw-r--r-- | zuul.d/scenarios/ironic.yaml | 4 | ||||
| -rw-r--r-- | zuul.d/scenarios/keystone-federation.yaml | 37 | ||||
| -rw-r--r-- | zuul.d/scenarios/masakari.yaml | 5 | ||||
| -rw-r--r-- | zuul.d/scenarios/nfv.yaml | 6 | ||||
| -rw-r--r-- | zuul.d/scenarios/octavia.yaml | 6 | ||||
| -rw-r--r-- | zuul.d/scenarios/ovn.yaml | 1 | ||||
| -rw-r--r-- | zuul.d/scenarios/telemetry.yaml | 5 | ||||
| -rw-r--r-- | zuul.d/scenarios/venus.yaml | 43 |
13 files changed, 88 insertions, 69 deletions
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index bae3aab5b..7a9b481cb 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -14,6 +14,7 @@ files: - ^ansible/group_vars/all/common.yml - ^requirements-core.yml + - ^roles/kolla-ansible-test-dashboard/ - ^tests/check-(config|failure|logs).sh - ^tests/get_logs.sh - ^tests/init-core-openstack.sh @@ -46,11 +47,11 @@ # Test latest ansible-core version on Ubuntu, minimum supported on others. # Use SLURP version (two releases back) on SLURP upgrades. ansible_core_version_constraint: >- - {{ ansible_core_version_slurp if is_slurp else ansible_core_version_min if - (is_upgrade or ansible_facts.distribution != "Ubuntu") else ansible_core_version_max }} - ansible_core_version_slurp: "==2.16.*" - ansible_core_version_max: "==2.18.*" - ansible_core_version_min: "==2.17.*" + {{ ansible_core_version_slurp if is_slurp else ansible_core_version_min if is_upgrade + or ansible_facts.distribution != "Ubuntu" else ansible_core_version_max }} + ansible_core_version_slurp: "==2.17.*" + ansible_core_version_max: "==2.19.*" + ansible_core_version_min: "==2.18.*" # NOTE(mgoddard): Test the use of interface names with dashes. api_interface_name: "vxlan-0" api_network_prefix: "192.0.2." diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 3fae65676..098624130 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -11,6 +11,7 @@ # NOTE(mnasiadka): Failing since # https://review.opendev.org/c/openstack/kolla-ansible/+/864780 # - kolla-ansible-scenario-container-engine-migration + - kolla-ansible-scenario-federation - kolla-ansible-scenario-haproxy-fqdn - kolla-ansible-scenario-kayobe - kolla-ansible-scenario-openbao @@ -29,9 +30,8 @@ # NOTE(mnasiadka): SSO and non-SSO tests are failing #- kolla-ansible-scenario-skyline - kolla-ansible-scenario-telemetry - - kolla-ansible-scenario-venus - openstack-cover-jobs - - openstack-python3-jobs + - openstack-python3-jobs-kolla-ansible - periodic-stable-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 diff --git a/zuul.d/python3-jobs.yaml b/zuul.d/python3-jobs.yaml new file mode 100644 index 000000000..5dc7903ed --- /dev/null +++ b/zuul.d/python3-jobs.yaml @@ -0,0 +1,23 @@ +- project-template: + name: openstack-python3-jobs-kolla-ansible + # NOTE(mnasiadka): Local definition to skip py310 jobs on Flamingo + description: | + Runs unit tests for an OpenStack Python project under the CPython + version 3 releases designated for testing the latest release. + check: + jobs: + - openstack-tox-pep8 + # py3.12 testing is added as mandatory from 2025.1 release onwards. + # From 2026.1, we run it as periodic only(assuming py3.10 and py3.13 + # will be enough coverage to run on every change) + - openstack-tox-py312 + gate: + jobs: + - openstack-tox-pep8 + # py3.12 testing is added as mandatory from 2025.1 release onwards. + # From 2026.1, we run it as periodic only(assuming py3.10 and py3.13 + # will be enough coverage to run on every change) + - openstack-tox-py312 + post: + jobs: + - publish-openstack-python-branch-tarball
\ No newline at end of file diff --git a/zuul.d/scenarios/aio.yaml b/zuul.d/scenarios/aio.yaml index 39bbe5f05..384a06b27 100644 --- a/zuul.d/scenarios/aio.yaml +++ b/zuul.d/scenarios/aio.yaml @@ -6,10 +6,10 @@ - ^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/(action_plugins|filter_plugins|library|module_utils)/ - - ^ansible/roles/(common|fluentd|glance|haproxy-config|heat|horizon|keystone|loadbalancer|loadbalancer-config|neutron|nova|nova-cell|openvswitch|placement|proxysql|rabbitmq)/ + - ^ansible/roles/(common|fluentd|glance|haproxy-config|heat|horizon|keystone|loadbalancer|loadbalancer-config|neutron|nova|nova-cell|openvswitch|placement|proxysql|rabbitmq|service.*)/ - ^kolla_ansible/ - - ^roles/kolla-ansible-deploy/ - - ^tests/test-(core-openstack|dashboard).sh + - ^roles/kolla-ansible-(deploy|tempest|test-dashboard)/ + - ^tests/testinfra/test_horizon.py - ^tools/init-runonce - job: diff --git a/zuul.d/scenarios/cephadm.yaml b/zuul.d/scenarios/cephadm.yaml index 28ac2128b..2120af30e 100644 --- a/zuul.d/scenarios/cephadm.yaml +++ b/zuul.d/scenarios/cephadm.yaml @@ -4,9 +4,9 @@ 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/all/(ceph|ceph-rgw|common|fluentd|glance|heat|horizon|keepalived|keystone|loadbalancer|neutron|nova|openvswitch|placement|proxysql|rabbitmq|valkey).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)/ + - ^ansible/roles/(ceph-rgw|common|fluentd|glance|haproxy-config|heat|horizon|keystone|loadbalancer|loadbalancer-config|neutron|nova|openvswitch|placement|proxysql|rabbitmq|valkey)/ - ^roles/cephadm/ vars: kolla_ansible_setup_disks_file_path: "/var/lib/ceph-osd.img" @@ -16,7 +16,7 @@ scenario: cephadm scenario_images_extra: - ^cinder - - ^redis + - ^valkey - job: name: kolla-ansible-debian-bookworm-cephadm diff --git a/zuul.d/scenarios/ironic.yaml b/zuul.d/scenarios/ironic.yaml index b1fa44906..ee2000557 100644 --- a/zuul.d/scenarios/ironic.yaml +++ b/zuul.d/scenarios/ironic.yaml @@ -40,12 +40,12 @@ - job: name: kolla-ansible-ubuntu-noble-ironic parent: kolla-ansible-ironic-base - nodeset: kolla-ansible-ubuntu-noble-8GB + nodeset: kolla-ansible-ubuntu-noble-16GB - job: name: kolla-ansible-ubuntu-noble-ironic-upgrade parent: kolla-ansible-ubuntu-noble-ironic - nodeset: kolla-ansible-ubuntu-noble-8GB + nodeset: kolla-ansible-ubuntu-noble-16GB - project-template: name: kolla-ansible-scenario-ironic diff --git a/zuul.d/scenarios/keystone-federation.yaml b/zuul.d/scenarios/keystone-federation.yaml new file mode 100644 index 000000000..47e3f3ff8 --- /dev/null +++ b/zuul.d/scenarios/keystone-federation.yaml @@ -0,0 +1,37 @@ +--- +- job: + name: kolla-ansible-federation-base + parent: kolla-ansible-base + voting: false + files: !inherit + - ^ansible/group_vars/all/keystone.yml + - ^ansible/roles/keystone/ + vars: + scenario: federation + scenario_images_extra: + - ^httpd + +- job: + name: kolla-ansible-debian-bookworm-federation + parent: kolla-ansible-federation-base + nodeset: kolla-ansible-debian-bookworm-multi-8GB + +- job: + name: kolla-ansible-rocky-10-federation + parent: kolla-ansible-federation-base + nodeset: kolla-ansible-rocky-10-multi-8GB + +- job: + name: kolla-ansible-ubuntu-noble-federation + parent: kolla-ansible-federation-base + nodeset: kolla-ansible-ubuntu-noble-multi-8GB + +- project-template: + name: kolla-ansible-scenario-federation + description: | + Runs Kolla-Ansible Keystone federation scenario jobs. + check: + jobs: + - kolla-ansible-debian-bookworm-federation + - kolla-ansible-rocky-10-federation + - kolla-ansible-ubuntu-noble-federation diff --git a/zuul.d/scenarios/masakari.yaml b/zuul.d/scenarios/masakari.yaml index 4593f0a67..02eb2a98e 100644 --- a/zuul.d/scenarios/masakari.yaml +++ b/zuul.d/scenarios/masakari.yaml @@ -4,14 +4,15 @@ parent: kolla-ansible-base voting: false files: !inherit - - ^ansible/group_vars/all/(hacluster|masakari).yml - - ^ansible/roles/(hacluster|masakari)/ + - ^ansible/group_vars/all/(hacluster|masakari|valkey).yml + - ^ansible/roles/(hacluster|masakari|valkey)/ - ^tests/test-masakari.sh vars: scenario: masakari scenario_images_extra: - ^masakari - ^hacluster + - ^valkey # TODO: Remove once Masakari has TLS support tls_enabled: false diff --git a/zuul.d/scenarios/nfv.yaml b/zuul.d/scenarios/nfv.yaml index 60e44f7ee..03df813c0 100644 --- a/zuul.d/scenarios/nfv.yaml +++ b/zuul.d/scenarios/nfv.yaml @@ -4,8 +4,8 @@ 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)/ + - ^ansible/group_vars/all/(aodh|barbican|heat|mistral|valkey|tacker).yml + - ^ansible/roles/(aodh|barbican|heat|mistral|valkey|tacker)/ - ^tests/test-scenario-nfv.sh vars: scenario: nfv @@ -13,7 +13,7 @@ - ^aodh - ^tacker - ^mistral - - ^redis + - ^valkey - ^barbican tls_enabled: false diff --git a/zuul.d/scenarios/octavia.yaml b/zuul.d/scenarios/octavia.yaml index d7fdcb208..520969f65 100644 --- a/zuul.d/scenarios/octavia.yaml +++ b/zuul.d/scenarios/octavia.yaml @@ -4,13 +4,13 @@ parent: kolla-ansible-base voting: false files: !inherit - - ^ansible/group_vars/all/octavia.yml - - ^ansible/roles/(octavia|octavia-certificates)/ + - ^ansible/group_vars/all/(octavia|valkey).yml + - ^ansible/roles/(octavia|octavia-certificates|valkey)/ - ^tests/test-octavia.sh vars: scenario: octavia scenario_images_extra: - - ^redis + - ^valkey - ^octavia tls_enabled: false diff --git a/zuul.d/scenarios/ovn.yaml b/zuul.d/scenarios/ovn.yaml index cbeca2005..8ff50fbb9 100644 --- a/zuul.d/scenarios/ovn.yaml +++ b/zuul.d/scenarios/ovn.yaml @@ -10,7 +10,6 @@ vars: scenario: ovn scenario_images_extra: - - ^redis - ^octavia - ^ovn diff --git a/zuul.d/scenarios/telemetry.yaml b/zuul.d/scenarios/telemetry.yaml index 08d01d890..bd762ea4c 100644 --- a/zuul.d/scenarios/telemetry.yaml +++ b/zuul.d/scenarios/telemetry.yaml @@ -4,8 +4,8 @@ parent: kolla-ansible-base voting: false files: - - ^ansible/group_vars/all/(aodh|ceilometer|gnocchi).yml - - ^ansible/roles/(aodh|ceilometer|gnocchi)/ + - ^ansible/group_vars/all/(aodh|ceilometer|gnocchi|valkey).yml + - ^ansible/roles/(aodh|ceilometer|gnocchi|valkey)/ - ^tests/test-telemetry.sh vars: scenario: telemetry @@ -13,6 +13,7 @@ - ^aodh - ^ceilometer - ^gnocchi + - ^valkey - job: name: kolla-ansible-debian-bookworm-telemetry diff --git a/zuul.d/scenarios/venus.yaml b/zuul.d/scenarios/venus.yaml deleted file mode 100644 index f933304c7..000000000 --- a/zuul.d/scenarios/venus.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- -- job: - name: kolla-ansible-venus-base - parent: kolla-ansible-base - voting: false - files: !inherit - - ^ansible/group_vars/all/(fluentd|opensearch|venus).yml - - ^ansible/roles/(fluentd|opensearch|venus)/ - - ^tests/test-venus.sh - vars: - scenario: venus - scenario_images_core: - - ^cron - - ^opensearch - - ^fluentd - - ^haproxy - - ^keepalived - - ^keystone - - ^kolla-toolbox - - ^mariadb - - ^memcached - - ^rabbitmq - - ^venus - tls_enabled: false - -- job: - name: kolla-ansible-debian-bookworm-venus - parent: kolla-ansible-venus-base - nodeset: kolla-ansible-debian-bookworm-8GB - -- job: - name: kolla-ansible-ubuntu-noble-venus - parent: kolla-ansible-venus-base - nodeset: kolla-ansible-ubuntu-noble-8GB - -- project-template: - name: kolla-ansible-scenario-venus - description: | - Runs Kolla-Ansible Venus scenario jobs. - check: - jobs: - - kolla-ansible-debian-bookworm-venus - - kolla-ansible-ubuntu-noble-venus |