diff --git a/.zuul.yaml b/.zuul.yaml index f0c2cd16..e8d83155 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,6 +3,7 @@ - job: name: ansible-collections-openstack-functional-devstack parent: openstacksdk-functional-devstack + branches: ^(stable/1.0.0|master).*$ post-run: ci/playbooks/postlog.yaml description: | Run openstack collections functional tests against a master devstack @@ -39,6 +40,8 @@ - job: name: ansible-collections-openstack-functional-devstack-octavia parent: ansible-collections-openstack-functional-devstack + branches: ^(stable/1.0.0|master).*$ + override-checkout: master description: | Run openstack collections functional tests against a master devstack with Octavia plugin enabled, using releases of openstacksdk and latest @@ -77,6 +80,7 @@ - job: name: ansible-collections-openstack-functional-devstack-releases parent: ansible-collections-openstack-functional-devstack + override-checkout: master description: | Run openstack collections functional tests against a master devstack using releases of openstacksdk and latest ansible release @@ -88,6 +92,7 @@ - job: name: ansible-collections-openstack-functional-devstack-ansible-2.9 parent: ansible-collections-openstack-functional-devstack + override-checkout: master description: | Run openstack collections functional tests against a master devstack using master of openstacksdk and stable 2.9 branch of ansible @@ -100,6 +105,7 @@ - job: name: ansible-collections-openstack-functional-devstack-ansible-2.11 parent: ansible-collections-openstack-functional-devstack + override-checkout: master description: | Run openstack collections functional tests against a master devstack using master of openstacksdk and stable 2.12 branch of ansible @@ -112,6 +118,7 @@ - job: name: ansible-collections-openstack-functional-devstack-ansible-2.12 parent: ansible-collections-openstack-functional-devstack + override-checkout: master description: | Run openstack collections functional tests against a master devstack using master of openstacksdk and stable 2.12 branch of ansible @@ -124,6 +131,7 @@ - job: name: ansible-collections-openstack-functional-devstack-ansible-new_sdk parent: ansible-collections-openstack-functional-devstack-ansible-2.12 + override-checkout: master voting: false vars: tox_install_siblings: true @@ -131,6 +139,7 @@ - job: name: ansible-collections-openstack-functional-devstack-ansible-devel parent: ansible-collections-openstack-functional-devstack + override-checkout: master description: | Run openstack collections functional tests against a master devstack using master of openstacksdk and devel branch of ansible @@ -158,6 +167,7 @@ override-checkout: stable/xena vars: tox_envlist: ansible + tox_install_siblings: true - job: name: ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12 @@ -174,6 +184,7 @@ override-checkout: stable/wallaby vars: tox_envlist: ansible + tox_install_siblings: true - job: name: ansible-collections-openstack-functional-devstack-victoria-ansible-2.12 @@ -190,6 +201,7 @@ override-checkout: stable/victoria vars: tox_envlist: ansible + tox_install_siblings: true - job: @@ -209,6 +221,7 @@ override-checkout: stable/ussuri vars: tox_envlist: ansible + tox_install_siblings: true - job: name: ansible-collections-openstack-functional-devstack-train-ansible-2.11 @@ -227,6 +240,7 @@ override-checkout: stable/train vars: tox_envlist: ansible + tox_install_siblings: true - job: name: ansible-collections-openstack-functional-devstack-queens-ansible-2.11 @@ -244,6 +258,7 @@ override-checkout: stable/train vars: tox_envlist: ansible + tox_install_siblings: true # Linters - job: @@ -343,11 +358,13 @@ name: tripleo-ci-centos-9-standalone-osa parent: tripleo-ci-centos-8-standalone-osa nodeset: single-centos-9-node - branches: master + branches: ^(stable/1.0.0|master).*$ + override-checkout: master vars: containers_base_image: quay.io/centos/centos:stream9 consumer_job: false build_container_images: true + branch_override: master files: *ooo_files irrelevant-files: *irr_files @@ -368,7 +385,7 @@ - job: name: tripleo-ci-centos-9-standalone-wallaby-osa parent: tripleo-ci-centos-9-standalone-osa - branches: master + branches: ^(stable/1.0.0|master).*$ override-checkout: stable/wallaby vars: branch_override: stable/wallaby @@ -425,6 +442,7 @@ dependencies: *deps_unit_lint - ansible-collections-openstack-functional-devstack-train-ansible-2.11: dependencies: *deps_unit_lint + voting: false - ansible-collections-openstack-functional-devstack-octavia: dependencies: *deps_unit_lint @@ -463,7 +481,7 @@ - ansible-collections-openstack-functional-devstack-ansible-2.12 - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12 - ansible-collections-openstack-functional-devstack-xena-ansible-2.12 - - ansible-collections-openstack-functional-devstack-train-ansible-2.11 + # - ansible-collections-openstack-functional-devstack-train-ansible-2.11 - ansible-collections-openstack-functional-devstack-octavia - tripleo-ci-centos-8-standalone-wallaby-osa