From 8e50bfc565e57d89aeb1c70c9ce70f49c3e114a5 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 23 Jun 2022 10:12:10 +0200 Subject: [PATCH] Continue Zed development Unfreeze roles and switch services back to master branch We also make distro jobs NV as Zed packages are not released yet, and Yoga sdk is not working with current ansible-collections-openstack. Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_horizon/+/848589 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_rally/+/848666 Change-Id: I1db9cf99afde2b8dc64149ea29bfef651a406f34 --- ansible-collection-requirements.yml | 12 +- ansible-role-requirements.yml | 224 +++++++++--------- .../upgrades/os-compatibility-matrix.html | 35 +++ doc/source/index.rst | 18 +- playbooks/defaults/repo_packages/gnocchi.yml | 2 +- .../defaults/repo_packages/nova_consoles.yml | 2 +- .../repo_packages/openstack_services.yml | 208 ++++++++-------- .../repo_packages/openstack_testing.yml | 25 +- playbooks/openstack-hosts-setup.yml | 4 +- scripts/gate-check-commit.sh | 2 +- scripts/run-upgrade.sh | 4 +- zuul.d/jobs.yaml | 191 +-------------- zuul.d/project-templates.yaml | 47 +--- 13 files changed, 303 insertions(+), 471 deletions(-) diff --git a/ansible-collection-requirements.yml b/ansible-collection-requirements.yml index 2b6235acd6..b42a5d908d 100644 --- a/ansible-collection-requirements.yml +++ b/ansible-collection-requirements.yml @@ -2,25 +2,25 @@ collections: - name: https://opendev.org/openstack/ansible-collections-openstack - version: 1.8.0 + version: master type: git - name: https://opendev.org/openstack/ansible-config_template version: 1.2.1 type: git - name: https://opendev.org/openstack/openstack-ansible-plugins - version: stable/yoga + version: master type: git - name: https://github.com/ansible-collections/community.general - version: 5.0.0 + version: 5.2.0 type: git - name: https://github.com/ansible-collections/community.rabbitmq version: 1.2.1 type: git - name: https://github.com/ansible-collections/community.mysql - version: 3.2.1 + version: 3.3.0 type: git - name: https://github.com/ansible-collections/community.crypto - version: 2.3.1 + version: 2.3.4 type: git - name: https://github.com/ansible-collections/ansible.posix version: 1.4.0 @@ -30,7 +30,7 @@ collections: type: git # NOTE(noonedeadpunk): needs version in galaxy.yml to pull from git - name: ansible.netcommon - version: 3.0.0 + version: 3.0.1 source: https://galaxy.ansible.com - name: ansible.utils version: 2.6.1 diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index f9d2d0acb5..9daec7bb27 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -2,360 +2,360 @@ - name: ansible-hardening scm: git src: https://opendev.org/openstack/ansible-hardening - version: e2427dc8446bddc722d5d216c3850b751824886b - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: apt_package_pinning scm: git src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning - version: 150a5a0bbce8a6379118f52d0a55aa506db50d86 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: galera_server scm: git src: https://opendev.org/openstack/openstack-ansible-galera_server - version: af86aaa58d045f4ceebf9762cd7d1507374d4140 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: ceph_client scm: git src: https://opendev.org/openstack/openstack-ansible-ceph_client - version: 5fe86bfab4307a0b295090951ee5fdddd9bdcba5 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: haproxy_server scm: git src: https://opendev.org/openstack/openstack-ansible-haproxy_server - version: be56e3f512dad3d4012c8bfe8457c8cdff40a277 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: keepalived scm: git src: https://github.com/evrardjp/ansible-keepalived - version: 0c9625bcc90104c72581af07bcb2e654fef14215 + version: master trackbranch: master shallow_since: '2022-05-03' - name: lxc_container_create scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_container_create - version: ef9bdcd9981d89348ee3a33fbb1294f5a0688f5b - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: lxc_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_hosts - version: c59a5d672bd404cb2e26e0e67fa18819dcf278c6 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: memcached_server scm: git src: https://opendev.org/openstack/openstack-ansible-memcached_server - version: f6a9f992ddb3c5a3a07df99aa9c4d4f2647d2b3f - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: openstack_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-openstack_hosts - version: 27c40c8a07f04574bf517930828cba7a53f9ff8b - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_keystone scm: git src: https://opendev.org/openstack/openstack-ansible-os_keystone - version: b7c8ad5171bdce6687447dc5a557f743184cdd47 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: openstack_openrc scm: git src: https://opendev.org/openstack/openstack-ansible-openstack_openrc - version: a6eb4b24561d6933dad56dbbb8ee3c690ba6aa4b - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_adjutant scm: git src: https://opendev.org/openstack/openstack-ansible-os_adjutant - version: 826343637a990f9a97cf7cc214a729eeded9bab3 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_aodh scm: git src: https://opendev.org/openstack/openstack-ansible-os_aodh - version: 1b128b64d21c4345b7088326796fb22b439dc84e - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_barbican scm: git src: https://opendev.org/openstack/openstack-ansible-os_barbican - version: 6aabfa74d4b766a91306bfaefb32ba1bf10be7fd - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_blazar scm: git src: https://opendev.org/openstack/openstack-ansible-os_blazar - version: 15c93ac55ac3515cd5f3ccae55bf357e6034144e - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_ceilometer scm: git src: https://opendev.org/openstack/openstack-ansible-os_ceilometer - version: 42b854bd165d3d7567d2da2ef5c4dbdddea8366b - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_cinder scm: git src: https://opendev.org/openstack/openstack-ansible-os_cinder - version: 9966f1dc532da7ad50f05e8f3eae0d2f3f79319d - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_cloudkitty scm: git src: https://opendev.org/openstack/openstack-ansible-os_cloudkitty - version: cfbfe75ac034ad787f54680f53e3c68bb3bb8c11 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_designate scm: git src: https://opendev.org/openstack/openstack-ansible-os_designate - version: f216f0850ae2d09ae5329f83abe4fa7919efd007 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_glance scm: git src: https://opendev.org/openstack/openstack-ansible-os_glance - version: 9438ed438a2fc4c94b376694555f8db4532bdabb - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_gnocchi scm: git src: https://opendev.org/openstack/openstack-ansible-os_gnocchi - version: baefb652da46d3c5a18ac03e37e358bb9b8d3a75 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_heat scm: git src: https://opendev.org/openstack/openstack-ansible-os_heat - version: 0fea9be7f206f9b7982d109fb7cd0e5e86075b70 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_horizon scm: git src: https://opendev.org/openstack/openstack-ansible-os_horizon - version: 8ab99ba03cbc57aec099e420dce679ddfaa89c42 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_ironic scm: git src: https://opendev.org/openstack/openstack-ansible-os_ironic - version: 4c41e649c31d13cfc7a7ada0937c4b2da5f85c1e - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_magnum scm: git src: https://opendev.org/openstack/openstack-ansible-os_magnum - version: 6b61596954e4912bc9fb03dbcf2e007ecdaba5aa - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_manila scm: git src: https://opendev.org/openstack/openstack-ansible-os_manila - version: 5d1dc3ccc4214ee5d3df5bed9406a7c7f181626d - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_masakari scm: git src: https://opendev.org/openstack/openstack-ansible-os_masakari - version: cade14c092d786a65f37339f6396be9021ddf2e3 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_mistral scm: git src: https://opendev.org/openstack/openstack-ansible-os_mistral - version: 1fa9a9b13f7306151694813d6e5a3c39e4f91d11 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_murano scm: git src: https://opendev.org/openstack/openstack-ansible-os_murano - version: 6e491fbbd2f781a2e81ce2f4c6f664f737259de7 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_neutron scm: git src: https://opendev.org/openstack/openstack-ansible-os_neutron - version: d37795a5b857b0d13bf9faf7881108b14cfd2474 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_nova scm: git src: https://opendev.org/openstack/openstack-ansible-os_nova - version: 906d995f979931b3d5c9007cd35fac7ec4b21f3e - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_octavia scm: git src: https://opendev.org/openstack/openstack-ansible-os_octavia - version: 7db84c4be469e8ae75458ec5b758b0a265c6c230 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_placement scm: git src: https://opendev.org/openstack/openstack-ansible-os_placement - version: e754ce4f76e275b231de51fbea21b58d724037a6 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_rally scm: git src: https://opendev.org/openstack/openstack-ansible-os_rally - version: 1a2dcc5ec5e33b730fda75e39d2350b85b89f9fc - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_sahara scm: git src: https://opendev.org/openstack/openstack-ansible-os_sahara - version: f6594f3ca5cd6ca81079c16c95d61c9224cf493e - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_senlin scm: git src: https://opendev.org/openstack/openstack-ansible-os_senlin - version: 8640e37b4beabb2cb201ff586c36faeb6012a109 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_swift scm: git src: https://opendev.org/openstack/openstack-ansible-os_swift - version: 4eaf78afd418a28ac6b0eb953274940ef0a8cc85 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_tacker scm: git src: https://opendev.org/openstack/openstack-ansible-os_tacker - version: 850a7a114a786f856be8428c257195817c0ba6ff - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_tempest scm: git src: https://opendev.org/openstack/openstack-ansible-os_tempest - version: 971e2f1cfd53e7ca0b3d959a8664b5bd1ca8edbf - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_trove scm: git src: https://opendev.org/openstack/openstack-ansible-os_trove - version: 70795724bc370525199d4b5552a562cd59a95d8b - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: os_zun scm: git src: https://opendev.org/openstack/openstack-ansible-os_zun - version: d047be44553863e2be8b8ebe44a324727c4e2e69 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: qdrouterd scm: git src: https://opendev.org/openstack/ansible-role-qdrouterd - version: d39dd86cb07a1a5bd8b233fa2e9e3a171796d599 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: rabbitmq_server scm: git src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server - version: 3b64a1ebe8caa271edd9a74bb629ade00af7135b - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: repo_server scm: git src: https://opendev.org/openstack/openstack-ansible-repo_server - version: a1acb5120afca0ee6b91ea8b72aa7dc87dee5f09 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: rsyslog_client scm: git src: https://opendev.org/openstack/openstack-ansible-rsyslog_client - version: a37aee7556de5d3761e09e3a871edbef881b58d7 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: rsyslog_server scm: git src: https://opendev.org/openstack/openstack-ansible-rsyslog_server - version: 8688d02e1fcedf8a5549bdd1263e1201b5c6b9cc - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: bird scm: git src: https://github.com/logan2211/ansible-bird - version: 904e55d56f82f36e3e9e9fbc5b3bd932a1151f7b + version: master trackbranch: master shallow_since: '2021-09-12' - name: etcd scm: git src: https://github.com/noonedeadpunk/ansible-etcd - version: e4491f63bbd023d5014b60ec554a5a74ffd34c74 + version: master trackbranch: master shallow_since: '2022-05-27' - name: unbound scm: git src: https://github.com/noonedeadpunk/ansible-role-unbound - version: 4eab099d707ee8e2c8b4b7fef38806fdddb2a2ea + version: master trackbranch: master shallow_since: '2022-05-27' - name: resolvconf scm: git src: https://github.com/logan2211/ansible-resolvconf - version: f7f694b3dd4361e364dccb4ce94e6510727fca2f + version: master trackbranch: master shallow_since: '2021-03-31' - name: ceph-ansible scm: git src: https://github.com/ceph/ceph-ansible - version: 941102d4e643bdcc5531bbe462e88558fb37206b + version: stable-6.0 trackbranch: stable-6.0 shallow_since: '2022-06-14' - name: opendaylight scm: git src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight - version: 4a9217ed0fe9078152435daaa2d3f45b81021b3a + version: master trackbranch: master shallow_since: '2019-09-14' - name: pacemaker_corosync scm: git src: https://github.com/noonedeadpunk/ansible-pacemaker-corosync - version: dacff1ed6ede207b8afcbfff5e990d875580893b + version: master trackbranch: master shallow_since: '2022-06-14' - name: systemd_service src: https://opendev.org/openstack/ansible-role-systemd_service scm: git - version: 339c4edc005b4a0cefe6fc3a310db5fba331910b - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: systemd_mount src: https://opendev.org/openstack/ansible-role-systemd_mount scm: git - version: 3129df4e5dd87bbcdb2201276485ce78e56ad5ed - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: systemd_networkd src: https://opendev.org/openstack/ansible-role-systemd_networkd scm: git - version: 999de0a3fd6dc0905a00da1ec222745befa22c43 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: python_venv_build src: https://opendev.org/openstack/ansible-role-python_venv_build scm: git - version: 6e86a29007adacec639527cd949132c58583a6f7 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: uwsgi src: https://opendev.org/openstack/ansible-role-uwsgi scm: git - version: b8bf27b1d21c4157aefe9b60be694bb5e8225e31 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' - name: pki src: https://opendev.org/openstack/ansible-role-pki scm: git - version: 92cf6117b5c54c53ecad1da290ccf71e9b273969 - trackbranch: stable/yoga + version: master + trackbranch: master shallow_since: '2022-06-19' diff --git a/doc/source/admin/upgrades/os-compatibility-matrix.html b/doc/source/admin/upgrades/os-compatibility-matrix.html index 5ada59ce5d..3e801c8ccb 100644 --- a/doc/source/admin/upgrades/os-compatibility-matrix.html +++ b/doc/source/admin/upgrades/os-compatibility-matrix.html @@ -343,4 +343,39 @@ ✘ ✘ + + Zed + source + ✘ + ✘ + ✔ + E + ✘ + ✘ + ✘ + ✔ + ✘ + ✘ + ✔ + ✘ + ✘ + ✘ + + + distro + ✘ + ✘ + ✔ + ✘ + ✘ + ✘ + ✘ + ✘ + ✘ + ✘ + ✘ + ✘ + ✘ + ✘ + diff --git a/doc/source/index.rst b/doc/source/index.rst index a3f894d6be..69c97df260 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -9,9 +9,8 @@ configuration of an OpenStack environment. Documentation for each of the following releases is available. - -Yoga: Under Development -~~~~~~~~~~~~~~~~~~~~~~~ +Zed: Under Development +~~~~~~~~~~~~~~~~~~~~~~ OpenStack-Ansible Yoga is currently in Release Candidate. @@ -26,6 +25,19 @@ OpenStack-Ansible Yoga is currently in Release Candidate. contributor/index reference/index +Yoga: Maintained +~~~~~~~~~~~~~~~~ + +OpenStack-Ansible Yoga series was first released with the 25.0.0 tag on +27 June 2022. + +* `OpenStack-Ansible Yoga Documentation`_ + +* `OpenStack-Ansible Yoga series release notes`_ + +.. _OpenStack-Ansible Yoga Documentation: https://docs.openstack.org/openstack-ansible/yoga/ +.. _OpenStack-Ansible Yoga series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/yoga.html + Xena: Maintained ~~~~~~~~~~~~~~~~ diff --git a/playbooks/defaults/repo_packages/gnocchi.yml b/playbooks/defaults/repo_packages/gnocchi.yml index b0953af630..e9e30c3943 100644 --- a/playbooks/defaults/repo_packages/gnocchi.yml +++ b/playbooks/defaults/repo_packages/gnocchi.yml @@ -29,7 +29,7 @@ ### or have a comment / reason attached to them as to why a tag can not work. -### HEAD as of 20.06.2022 ### +### HEAD as of 23.06.2022 ### ## Gnocchi service ## This service has a different stable branch strategy to the rest of OpenStack. diff --git a/playbooks/defaults/repo_packages/nova_consoles.yml b/playbooks/defaults/repo_packages/nova_consoles.yml index 154819d6ab..81036af732 100644 --- a/playbooks/defaults/repo_packages/nova_consoles.yml +++ b/playbooks/defaults/repo_packages/nova_consoles.yml @@ -24,7 +24,7 @@ ## * All items with this file should be separated by `name_` note that the name of the ## package should be one long name with no additional `_` separating it. -### HEAD as of 20.06.2022 ### +### HEAD as of 23.06.2022 ### ## NOVNC from source novncproxy_git_repo: https://github.com/novnc/noVNC diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 96a56b51c7..99de4758fc 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -28,33 +28,33 @@ ### Before this is shipped all of these services should have a tag set as the branch, ### or have a comment / reason attached to them as to why a tag can not work. -### HEAD as of 20.06.2022 ### +### HEAD as of 23.06.2022 ### ## Global Requirements requirements_git_repo: https://opendev.org/openstack/requirements -requirements_git_install_branch: 5228a6045ccb57150016c9303359d89207a28334 -requirements_git_track_branch: stable/yoga +requirements_git_install_branch: 264c424c399b0ef931a729caa3aa76888e5727c7 +requirements_git_track_branch: master ## Adjutant service adjutant_git_repo: https://opendev.org/openstack/adjutant adjutant_git_install_branch: b305d7285f3ea2e12210e592702c4d66a31d6646 -adjutant_git_track_branch: stable/yoga +adjutant_git_track_branch: master ## Adjutant dashboard plugin adjutant_dashboard_git_repo: https://opendev.org/openstack/adjutant-ui adjutant_dashboard_git_install_branch: 104c474479e9a89d22b96777378ff59983c03393 -adjutant_dashboard_git_track_branch: stable/yoga +adjutant_dashboard_git_track_branch: master ## Aodh service aodh_git_repo: https://opendev.org/openstack/aodh -aodh_git_install_branch: 539145cce1cbb1a862f135518f8b316a3fd0002a -aodh_git_track_branch: stable/yoga +aodh_git_install_branch: 1a4cfd7dfc704e76513a2e19f897220e77ee1b32 +aodh_git_track_branch: master ## Barbican service barbican_git_repo: https://opendev.org/openstack/barbican -barbican_git_install_branch: 29e8fd054dbee79be2403e81fbe864aef8773ffe -barbican_git_track_branch: stable/yoga +barbican_git_install_branch: ad1649c81e87646bca8cfc7d7b77787c4e9fe904 +barbican_git_track_branch: master ## Barbican dashboard plugin @@ -65,108 +65,108 @@ barbican_dashboard_git_track_branch: master ## Ceilometer service ceilometer_git_repo: https://opendev.org/openstack/ceilometer -ceilometer_git_install_branch: cc22c4d6e8e21f9d142ba0d66c75a3d994924a1e -ceilometer_git_track_branch: stable/yoga +ceilometer_git_install_branch: 59cbdb48e0160048e9390ea06ebb56dbde9368a4 +ceilometer_git_track_branch: master ## Cinder service cinder_git_repo: https://opendev.org/openstack/cinder -cinder_git_install_branch: f728548f3faad3c7278dc3d4d137a6265db17677 -cinder_git_track_branch: stable/yoga +cinder_git_install_branch: 2774c2537e8afabe8e46f1e5c9b08e4ff2641743 +cinder_git_track_branch: master ## Cloudkitty service cloudkitty_git_repo: https://opendev.org/openstack/cloudkitty -cloudkitty_git_install_branch: abaf750d22bafd49f07ac053c280cb1675101043 -cloudkitty_git_track_branch: stable/yoga +cloudkitty_git_install_branch: e47e0289fb4f2624a6653588c828fd0dada600c6 +cloudkitty_git_track_branch: master ## Cloudkitty dashboard plugin cloudkitty_dashboard_git_repo: https://opendev.org/openstack/cloudkitty-dashboard -cloudkitty_dashboard_git_install_branch: 6dd285cf5423c20873c7d7069a0fa9427c818538 -cloudkitty_dashboard_git_track_branch: stable/yoga +cloudkitty_dashboard_git_install_branch: 2f52d6d3c883f52cc54d3b11f25b5997ef3f47e4 +cloudkitty_dashboard_git_track_branch: master ## Designate service designate_git_repo: https://opendev.org/openstack/designate -designate_git_install_branch: 3808102790ca8ccb559c865ddea15876b5a19939 -designate_git_track_branch: stable/yoga +designate_git_install_branch: 260e1ddd798fb813804cbfb757eb9f88affab1be +designate_git_track_branch: master ## Horizon Designate dashboard plugin designate_dashboard_git_repo: https://opendev.org/openstack/designate-dashboard -designate_dashboard_git_install_branch: 8cd46373cbb50c778b9daf787d367d18b70f0e69 -designate_dashboard_git_track_branch: stable/yoga +designate_dashboard_git_install_branch: bfe7af3a8088fbd823285304182ac72b5323fa4c +designate_dashboard_git_track_branch: master ## Glance service glance_git_repo: https://opendev.org/openstack/glance -glance_git_install_branch: 1964876644c7086eff516832a19206d28891110d -glance_git_track_branch: stable/yoga +glance_git_install_branch: 53f322f1d8c0a5c1e8c494f88f1f05c47b29729a +glance_git_track_branch: master ## Heat service heat_git_repo: https://opendev.org/openstack/heat -heat_git_install_branch: b3cefb392c52cb1fe2c832ffed4cc117bad1e070 -heat_git_track_branch: stable/yoga +heat_git_install_branch: c37ea72a6b2c424136ed2ee2cd378928021da78e +heat_git_track_branch: master ## Horizon Heat dashboard plugin heat_dashboard_git_repo: https://opendev.org/openstack/heat-dashboard -heat_dashboard_git_install_branch: f3124ce95279dd62d3a402229ca8926ac6428c44 -heat_dashboard_git_track_branch: stable/yoga +heat_dashboard_git_install_branch: 59c7b032d924d50f8cf0bdb23434bed833f55f01 +heat_dashboard_git_track_branch: master ## Horizon service horizon_git_repo: https://opendev.org/openstack/horizon -horizon_git_install_branch: 3a6569960247c578441ee34c1b054da8e77f6481 -horizon_git_track_branch: stable/yoga +horizon_git_install_branch: 2ebbb384a0c11b10d4b5a7e7f711c3066f9f3e2d +horizon_git_track_branch: master ## Horizon Ironic dashboard plugin ironic_dashboard_git_repo: https://opendev.org/openstack/ironic-ui -ironic_dashboard_git_install_branch: 5380524aa8c8b4c189dcef3548ae9c803975b66f -ironic_dashboard_git_track_branch: stable/yoga +ironic_dashboard_git_install_branch: 8974cb6771a663d5be146fabaec2abd5982426e8 +ironic_dashboard_git_track_branch: master ## Horizon Magnum dashboard plugin magnum_dashboard_git_repo: https://opendev.org/openstack/magnum-ui -magnum_dashboard_git_install_branch: ea8a0d3a610b37d9d6bdcb08058d5ceeec722cab -magnum_dashboard_git_track_branch: stable/yoga +magnum_dashboard_git_install_branch: 4c63756e4bfffd8398a4508ca9a5f43403b139cc +magnum_dashboard_git_track_branch: master ## Horizon Masakari dashboard plugin masakari_dashboard_git_repo: https://opendev.org/openstack/masakari-dashboard -masakari_dashboard_git_install_branch: de7b74d28eea77555df23b364451b847aa966eaf -masakari_dashboard_git_track_branch: stable/yoga +masakari_dashboard_git_install_branch: 26671c6dcd40f3da7c61effa02cbe7cc45dc0f80 +masakari_dashboard_git_track_branch: master ## Horizon Sahara dashboard plugin sahara_dashboard_git_repo: https://opendev.org/openstack/sahara-dashboard -sahara_dashboard_git_install_branch: 2e00dc73f75b7c77a95ac854673bf9a1c43ac4d5 -sahara_dashboard_git_track_branch: stable/yoga +sahara_dashboard_git_install_branch: da7235b34a6bb01dbe206769c3c619ee2fc847d8 +sahara_dashboard_git_track_branch: master ## Keystone service keystone_git_repo: https://opendev.org/openstack/keystone -keystone_git_install_branch: ae0b0a17b2da98d135d409ab9d010a9e220d23fa -keystone_git_track_branch: stable/yoga +keystone_git_install_branch: daa8e746ba03aab9c95c87bad4d8eac1595b1513 +keystone_git_track_branch: master ## Manila service manila_git_repo: https://opendev.org/openstack/manila -manila_git_install_branch: 8c1377f4f899e573afdfd3fc7b7cbb248521b05e -manila_git_track_branch: stable/yoga +manila_git_install_branch: 7fc38095505e15986d0bd4ed3c900a5669fe79c8 +manila_git_track_branch: master ## Neutron service neutron_git_repo: https://opendev.org/openstack/neutron -neutron_git_install_branch: f6e47be8d10e58e6db4a40d9115eb4c8e54e01fe -neutron_git_track_branch: stable/yoga +neutron_git_install_branch: dda8c70fbe3948de45bf72c5f9be7c657ebe42a9 +neutron_git_track_branch: master neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas -neutron_vpnaas_git_install_branch: 52cfcb31096bd28adef62a38863cde59c2e5313f -neutron_vpnaas_git_track_branch: stable/yoga +neutron_vpnaas_git_install_branch: 740bf12dfa6850c84a3ce07c1a840ae113045f71 +neutron_vpnaas_git_track_branch: master neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing -neutron_dynamic_routing_git_install_branch: bd27a3d4a33f39bb70c926cca1f7ba8ec1340f06 -neutron_dynamic_routing_git_track_branch: stable/yoga +neutron_dynamic_routing_git_install_branch: 61817eaeee84a4f5538f0e5f7473231c903a9399 +neutron_dynamic_routing_git_track_branch: master # Networking calico follows master networking_calico_git_repo: https://github.com/projectcalico/networking-calico @@ -174,154 +174,154 @@ networking_calico_git_install_branch: 69ada593823daaecb997114e694522449839f131 networking_calico_git_track_branch: release-v3.21 networking_odl_git_repo: https://opendev.org/openstack/networking-odl -networking_odl_git_install_branch: e885791c559586bac331c7f7ab9d007447cfa58e -networking_odl_git_track_branch: stable/yoga +networking_odl_git_install_branch: 6d4c8ef33010466580570ed00489afcfa9a1a155 +networking_odl_git_track_branch: master networking_bgpvpn_git_repo: https://opendev.org/openstack/networking-bgpvpn -networking_bgpvpn_git_install_branch: 370bf1381fae437899c13a3512090dff58661e45 -networking_bgpvpn_git_track_branch: stable/yoga +networking_bgpvpn_git_install_branch: d6a7d99fa735f002c4d56f9e5b3ddfe23cb806a9 +networking_bgpvpn_git_track_branch: master networking_sfc_git_repo: https://opendev.org/openstack/networking-sfc -networking_sfc_git_install_branch: 2d9e61daf20436354e668d76089f5a79baa938bd -networking_sfc_git_track_branch: stable/yoga +networking_sfc_git_install_branch: 161c6ee578e2397abf520e227d74dfd61b99fdfa +networking_sfc_git_track_branch: master networking_generic_switch_git_repo: https://opendev.org/openstack/networking-generic-switch -networking_generic_switch_git_install_branch: a5926116a3fa5fd0cdd74d4f5d97e1e54514f737 -networking_generic_switch_git_track_branch: stable/yoga +networking_generic_switch_git_install_branch: 1a31396cb017d31eee3693f279219d695ef78f92 +networking_generic_switch_git_track_branch: master networking_nsx_git_repo: https://opendev.org/x/vmware-nsx networking_nsx_git_install_branch: 0253265f75f63d5619b30f16a6b64459dec79d82 networking_nsx_git_track_branch: master networking_nsxlib_git_repo: https://opendev.org/x/vmware-nsxlib -networking_nsxlib_git_install_branch: d915f2fecbc0e629b67873d4923c4aba9f0bcdcc +networking_nsxlib_git_install_branch: 3548bcfd87fbf6efba4c930daa410cccc5b8203a networking_nsxlib_git_track_branch: master ## Nova service nova_git_repo: https://opendev.org/openstack/nova -nova_git_install_branch: 6b9c55ac5d3399a444efd38e055ee91f7b70c3d4 -nova_git_track_branch: stable/yoga +nova_git_install_branch: c4cd6ee4615a35a57dd6a2f3cb5a9cbc8653f7ee +nova_git_track_branch: master ## Sahara service sahara_git_repo: https://opendev.org/openstack/sahara -sahara_git_install_branch: 4af54a062c3536ecce37e1386ee549fadbf3392d -sahara_git_track_branch: stable/yoga +sahara_git_install_branch: 67a56de970d664b49d5178bdca637b53dd2f380e +sahara_git_track_branch: master ## Senlin service senlin_git_repo: https://opendev.org/openstack/senlin -senlin_git_install_branch: 804056e856fb80bc881f6ef22eb57bc4adf7a287 -senlin_git_track_branch: stable/yoga +senlin_git_install_branch: 59c5ef4b45dbad441fa22175522651ff09fba1a4 +senlin_git_track_branch: master ## Swift service swift_git_repo: https://opendev.org/openstack/swift -swift_git_install_branch: 36ebcc8484db112c9c7998b35aec2e0b004dae33 -swift_git_track_branch: stable/yoga +swift_git_install_branch: a303e30fc4e38217a45d65c1db1326eeec9cc661 +swift_git_track_branch: master ## Ironic service ironic_git_repo: https://opendev.org/openstack/ironic -ironic_git_install_branch: d035a8fd0219350ad64c1449eaef4eb621eb3b29 -ironic_git_track_branch: stable/yoga +ironic_git_install_branch: 1b6114934c122df115b8c945ca1ce8c3b7bd9bfd +ironic_git_track_branch: master ## Ironic inspector service ironic_inspector_git_repo: https://opendev.org/openstack/ironic-inspector -ironic_inspector_git_install_branch: 0f70f89fbe146866a7a390d99db6c15c22939fce -ironic_inspector_git_track_branch: stable/yoga +ironic_inspector_git_install_branch: 0e54080b0c08cae9835f87bb2ed190d7f80f6dff +ironic_inspector_git_track_branch: master ## Magnum service magnum_git_repo: https://opendev.org/openstack/magnum -magnum_git_install_branch: 2ae6cd95f18a1675ec6059e6434ee58a1868b07f -magnum_git_track_branch: stable/yoga +magnum_git_install_branch: a5797a5eac467dade5843cd239ad500b6a43b2c6 +magnum_git_track_branch: master ## Masakari service masakari_git_repo: https://opendev.org/openstack/masakari -masakari_git_install_branch: d689abff9803a0fe7f9a3bce859e2d29eee32277 -masakari_git_track_branch: stable/yoga +masakari_git_install_branch: c3fc0c2f9d0cf77f2c0da3eb1573053f6de4ac7c +masakari_git_track_branch: master ## Masakari monitors services masakari_monitors_git_repo: https://opendev.org/openstack/masakari-monitors -masakari_monitors_git_install_branch: 541819593de1567a0e173eeaf743c76406aa5193 -masakari_monitors_git_track_branch: stable/yoga +masakari_monitors_git_install_branch: b42b5e5b5467aa1f635634d3c2a096d74150c013 +masakari_monitors_git_track_branch: master ## Mistral service mistral_git_repo: https://opendev.org/openstack/mistral -mistral_git_install_branch: a9024d42ff7f147e1965d42852fd1f0bddef7ca6 -mistral_git_track_branch: stable/yoga +mistral_git_install_branch: 28f94b0c64ebbc04729c441c801682e312fc9c64 +mistral_git_track_branch: master mistral_extra_git_repo: https://opendev.org/openstack/mistral-extra -mistral_extra_git_install_branch: 4beae859c64356a77f64d7135426fcf0c6f39738 -mistral_extra_git_track_branch: stable/yoga +mistral_extra_git_install_branch: d8a8f99d39cb225efd3da41915016e97ad9c64e3 +mistral_extra_git_track_branch: master ## Murano service murano_git_repo: https://opendev.org/openstack/murano -murano_git_install_branch: 27dd423015152ca07f22d4bb396e2d5e4a0f940b -murano_git_track_branch: stable/yoga +murano_git_install_branch: 4434b57486eda599a15624dd27eca7ef18bcfa1f +murano_git_track_branch: master murano_dashboard_git_repo: https://opendev.org/openstack/murano-dashboard -murano_dashboard_git_install_branch: 06c357a470198e132617e72a8a9db9e0190d50f5 -murano_dashboard_git_track_branch: stable/yoga +murano_dashboard_git_install_branch: 5a36a31de61cee733b899df1d0d8d8ab8b05f58a +murano_dashboard_git_track_branch: master ## Trove service trove_git_repo: https://opendev.org/openstack/trove -trove_git_install_branch: 94c7abd5d5b73ee395f78eda987e06d12a2ed7b9 -trove_git_track_branch: stable/yoga +trove_git_install_branch: b36d0b23a2ec66f50ddd5b0e8fdcdd888d19994a +trove_git_track_branch: master ## Horizon Trove dashboard plugin trove_dashboard_git_repo: https://opendev.org/openstack/trove-dashboard -trove_dashboard_git_install_branch: 8aa63e73453b5953068e9b511cbd759d20f0a690 -trove_dashboard_git_track_branch: stable/yoga +trove_dashboard_git_install_branch: a2d62eb141818b85de5c1b4d2a050f6dd19c7332 +trove_dashboard_git_track_branch: master ## Octavia service octavia_git_repo: https://opendev.org/openstack/octavia -octavia_git_install_branch: a237182303d6a5559ea1148310a6d8fb18c6cbd3 -octavia_git_track_branch: stable/yoga +octavia_git_install_branch: 4c22eb8b682a2e928176405cd11175f6820de09f +octavia_git_track_branch: master ## Placement service placement_git_repo: https://opendev.org/openstack/placement -placement_git_install_branch: 4d3df47ee3e394e3178d58c15306620809ad2806 -placement_git_track_branch: stable/yoga +placement_git_install_branch: f052a3539a29e25652aa7e1d7c009f492d6089b2 +placement_git_track_branch: master ## Tacker service tacker_git_repo: https://opendev.org/openstack/tacker -tacker_git_install_branch: d06426d1e21cd8f9f0a52251fd44496c5ab727b9 -tacker_git_track_branch: stable/yoga +tacker_git_install_branch: e4347067263711b81e1118fe9cec4ede92c14255 +tacker_git_track_branch: master ## Horizon Octavia dashboard plugin octavia_dashboard_git_repo: https://opendev.org/openstack/octavia-dashboard -octavia_dashboard_git_install_branch: 127294f10d0fcd718a519d8a957bac55504023c5 -octavia_dashboard_git_track_branch: stable/yoga +octavia_dashboard_git_install_branch: 1f6691e05cc7927c872d319bf7be76ab4e309cf6 +octavia_dashboard_git_track_branch: master ## Blazar service blazar_git_repo: https://opendev.org/openstack/blazar -blazar_git_install_branch: 51aed25bb6ae3a0c230bbe879d5ef7eb38e5af19 -blazar_git_track_branch: stable/yoga +blazar_git_install_branch: bda5168336477e4d97abf6191b3c7162b4144191 +blazar_git_track_branch: master ## Blazar Nova Service blazar_nova_git_repo: https://opendev.org/openstack/blazar-nova -blazar_nova_git_install_branch: f7a8f9c8076dc26936ce6ffaa2567f729c60d863 -blazar_nova_git_track_branch: stable/yoga +blazar_nova_git_install_branch: dcc985879315c9321a3dc1f75c7d431e2e209ab2 +blazar_nova_git_track_branch: master ## Zun service zun_git_repo: https://opendev.org/openstack/zun -zun_git_install_branch: e0d0c28dccdfd9ed975ec02cfcdb1f2a7186a516 -zun_git_track_branch: stable/yoga +zun_git_install_branch: a4e5688a68e48cb4dd066c49a2d7856de3bba92b +zun_git_track_branch: master ## Zun kuryr service zun_kuryr_git_repo: https://opendev.org/openstack/kuryr-libnetwork -zun_kuryr_git_install_branch: 49078002d6575ec6ba4121c3b3fe8d6517ba36e3 -zun_kuryr_git_track_branch: stable/yoga +zun_kuryr_git_install_branch: f73cad32770a6a00c9ee55aee6fbde2b0f87e25d +zun_kuryr_git_track_branch: master ## Zun kuryr library zun_kuryr_lib_git_repo: https://opendev.org/openstack/kuryr -zun_kuryr_lib_git_install_branch: 96b0991f79a0b16c3cef9161c0d171ddbe0d0327 -zun_kuryr_lib_git_track_branch: stable/yoga +zun_kuryr_lib_git_install_branch: 415a54249b6ff83932428d9957ab889678c13455 +zun_kuryr_lib_git_track_branch: master diff --git a/playbooks/defaults/repo_packages/openstack_testing.yml b/playbooks/defaults/repo_packages/openstack_testing.yml index f6f6baf403..cc5ecfe821 100644 --- a/playbooks/defaults/repo_packages/openstack_testing.yml +++ b/playbooks/defaults/repo_packages/openstack_testing.yml @@ -13,26 +13,26 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 27.05.2022 ### +### HEAD as of 23.06.2022 ### tempest_git_repo: https://opendev.org/openstack/tempest -tempest_git_install_branch: 263825a17a8393ade1ff0d99a1ad035ca47eee8b +tempest_git_install_branch: 7559bb649e11377c8cba4e7a6129025a7d3d5d06 tempest_git_track_branch: master tempest_plugin_barbican_git_repo: https://opendev.org/openstack/barbican-tempest-plugin -tempest_plugin_barbican_git_install_branch: 9fe096e1422c7c884b94166763b4857b5abcea30 +tempest_plugin_barbican_git_install_branch: 11c8cfae0ce85b874ab055e685accba85f460fda tempest_plugin_barbican_git_track_branch: master tempest_plugin_cinder_git_repo: https://opendev.org/openstack/cinder-tempest-plugin -tempest_plugin_cinder_git_install_branch: 9d89d4ee1f1fa43dc85f5969d2c6ce393e8089ae +tempest_plugin_cinder_git_install_branch: 141dace60e5e4d14bf39b65872a4c9db63ba8df4 tempest_plugin_cinder_git_track_branch: master tempest_plugin_cloudkitty_git_repo: https://opendev.org/openstack/cloudkitty-tempest-plugin -tempest_plugin_cloudkitty_git_install_branch: fe8ed3b94d0e01e1f2dc855edc1862cf64880040 +tempest_plugin_cloudkitty_git_install_branch: 97cd523c437246033ed38ffe6ec7f545abe20d7f tempest_plugin_cloudkitty_git_track_branch: master tempest_plugin_designate_git_repo: https://opendev.org/openstack/designate-tempest-plugin -tempest_plugin_designate_git_install_branch: abf66d1a09a89b6a189fa7e8eb68c68bf20e6521 +tempest_plugin_designate_git_install_branch: 6d5e0a1406070667f97718e98dfe21dbc95b3d98 tempest_plugin_designate_git_track_branch: master tempest_plugin_heat_git_repo: https://opendev.org/openstack/heat-tempest-plugin @@ -40,7 +40,7 @@ tempest_plugin_heat_git_install_branch: ba43685c131d6387779ed35f5bf61fc86667a728 tempest_plugin_heat_git_track_branch: master tempest_plugin_ironic_git_repo: https://opendev.org/openstack/ironic-tempest-plugin -tempest_plugin_ironic_git_install_branch: 023c01e7e1214153229da14e2a22d6caadc8dab6 +tempest_plugin_ironic_git_install_branch: 3af6253bc96ba1897feb0a88e60bddd0097d05ff tempest_plugin_ironic_git_track_branch: master tempest_plugin_keystone_git_repo: https://opendev.org/openstack/keystone-tempest-plugin @@ -52,15 +52,15 @@ tempest_plugin_magnum_git_install_branch: 70d8e4551409c712f4a1e523566951da72e187 tempest_plugin_magnum_git_track_branch: master tempest_plugin_manila_git_repo: https://opendev.org/openstack/manila-tempest-plugin -tempest_plugin_manila_git_install_branch: a6d89a15aa49df0a10966408ddbe2c9f9e5ec0ab +tempest_plugin_manila_git_install_branch: b31d6efb21cfec92fed899a1eec1cb5de30c737b tempest_plugin_manila_git_track_branch: master tempest_plugin_murano_git_repo: https://opendev.org/openstack/murano-tempest-plugin -tempest_plugin_murano_git_install_branch: 1ca439adb0c11ceff702bff409b6e00ffffb0ed9 +tempest_plugin_murano_git_install_branch: 97d430bbe105b204960cddd9d587d11cf1f9b2ca tempest_plugin_murano_git_track_branch: master tempest_plugin_neutron_git_repo: https://opendev.org/openstack/neutron-tempest-plugin -tempest_plugin_neutron_git_install_branch: 8988a01a96df301be2ca9a7536256a4cfec0f087 +tempest_plugin_neutron_git_install_branch: 318ec127c548d4f3cba1ceb9edb11c5d250b1786 tempest_plugin_neutron_git_track_branch: master tempest_plugin_novajoin_git_repo: https://opendev.org/x/novajoin-tempest-plugin @@ -94,3 +94,8 @@ tempest_plugin_zaqar_git_track_branch: master tempest_plugin_zun_git_repo: https://opendev.org/openstack/zun-tempest-plugin tempest_plugin_zun_git_install_branch: c6b830885c15ed40e9e5436c88c72d32e754beae tempest_plugin_zun_git_track_branch: master + +rally_openstack_git_repo: https://opendev.org/openstack/rally-openstack +rally_openstack_git_install_branch: 3984f97c1c9fd0695bab123da81323e83abac3a3 +rally_openstack_git_track_branch: master + diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml index 6e92ba15ad..10a0b39e2f 100644 --- a/playbooks/openstack-hosts-setup.yml +++ b/playbooks/openstack-hosts-setup.yml @@ -56,12 +56,10 @@ - (ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_release'] == 'bullseye') or (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'focal') or (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'jammy') or - (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '8') or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '9') msg: > The only supported platforms for this release are Debian 11 (Bullseye), - Ubuntu 20.04 LTS (Focal), Ubuntu 22.04 (Yammy) CentOS 8 derivatives such - as Rocky Linux, CentOS 8 Stream and CentOS 9 Stream. + Ubuntu 20.04 LTS (Focal), Ubuntu 22.04 (Jammy) and CentOS 9 Stream. roles: - role: "openstack_hosts" vars_files: diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh index 66308dad62..f29713996b 100755 --- a/scripts/gate-check-commit.sh +++ b/scripts/gate-check-commit.sh @@ -49,7 +49,7 @@ export INSTALL_METHOD=${3:-"source"} # Set the source branch for upgrade tests # Be sure to change this whenever a new stable branch # is created. The checkout must always be N-1. -export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/xena'} +export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/yoga'} # enable the ARA callback plugin export SETUP_ARA=${SETUP_ARA:-true} diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh index 4d90ea48d9..8270d8c0a5 100755 --- a/scripts/run-upgrade.sh +++ b/scripts/run-upgrade.sh @@ -31,10 +31,10 @@ export SCRIPTS_PATH="$(dirname "$(readlink -f "${0}")")" export MAIN_PATH="$(dirname "${SCRIPTS_PATH}")" # The expected source series name -export SOURCE_SERIES="xena" +export SOURCE_SERIES="yoga" # The expected target series name -export TARGET_SERIES="yoga" +export TARGET_SERIES="zed" # The expected OSA config dir export OSA_CONFIG_DIR="${OSA_CONFIG_DIR:-/etc/openstack_deploy}" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 6828604ce1..e3cd2b8d27 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -415,6 +415,7 @@ name: openstack-ansible-deploy-aio_distro_metal-ubuntu-focal parent: openstack-ansible-deploy-aio-distro nodeset: ubuntu-focal + voting: false - job: name: openstack-ansible-upgrade-aio_metal-ubuntu-focal @@ -580,199 +581,11 @@ nodeset: centos-9-stream timeout: 10800 -# centos 8 stream - job: - name: openstack-ansible-deploy-aio_lxc-centos-8-stream + name: openstack-ansible-deploy-hosts_lxc_overlayfs-centos-9-stream parent: openstack-ansible-deploy-aio nodeset: centos-8-stream -- job: - name: openstack-ansible-deploy-infra_lxc-centos-8-stream - parent: openstack-ansible-deploy-aio-infra - nodeset: centos-8-stream - -- job: - name: openstack-ansible-deploy-hosts_distro_lxc-centos-8-stream - parent: openstack-ansible-deploy-aio-hosts - nodeset: centos-8-stream - -- job: - name: openstack-ansible-deploy-hosts_lxc-centos-8-stream - parent: openstack-ansible-deploy-aio-hosts - nodeset: centos-8-stream - -- job: - name: openstack-ansible-deploy-hosts_metal-centos-8-stream - parent: openstack-ansible-deploy-aio-hosts - nodeset: centos-8-stream - -- job: - name: openstack-ansible-deploy-aio_distro_lxc-centos-8-stream - parent: openstack-ansible-deploy-aio-distro - nodeset: centos-8-stream - -- job: - name: openstack-ansible-deploy-aio_ceph-centos-8-stream - parent: openstack-ansible-deploy-aio - nodeset: centos-8-stream - -- job: - name: openstack-ansible-deploy-aio_nfs-centos-8-stream - parent: openstack-ansible-deploy-aio - nodeset: centos-8-stream - -- job: - name: openstack-ansible-deploy-aio_distro_ceph-centos-8-stream - parent: openstack-ansible-deploy-aio-distro - nodeset: centos-8-stream - -- job: - name: openstack-ansible-upgrade-aio_lxc-centos-8-stream - parent: openstack-ansible-deploy-aio - nodeset: centos-8-stream - timeout: 10800 - -- job: - name: openstack-ansible-upgrade-infra_lxc-centos-8-stream - parent: openstack-ansible-deploy-aio-infra - nodeset: centos-8-stream - timeout: 10800 - -- job: - name: openstack-ansible-deploy-aio_metal-centos-8-stream - parent: openstack-ansible-deploy-aio - nodeset: centos-8-stream - -- job: - name: openstack-ansible-deploy-aio_telemetry_metal-centos-8-stream - parent: openstack-ansible-deploy-aio - nodeset: centos-8-stream - -- job: - name: openstack-ansible-deploy-aio_distro_metal-centos-8-stream - parent: openstack-ansible-deploy-aio-distro - nodeset: centos-8-stream - voting: false - -- job: - name: openstack-ansible-deploy-aio_nspawn-centos-8-stream - parent: openstack-ansible-deploy-aio - nodeset: centos-8-stream - -- job: - name: openstack-ansible-upgrade-aio_ceph-centos-8-stream - parent: openstack-ansible-deploy-aio - nodeset: centos-8-stream - timeout: 10800 - -- job: - name: openstack-ansible-upgrade-aio_metal-centos-8-stream - parent: openstack-ansible-deploy-aio - nodeset: centos-8-stream - timeout: 10800 - -- job: - name: openstack-ansible-deploy-hosts_lxc_overlayfs-centos-8-stream - parent: openstack-ansible-deploy-aio - nodeset: centos-8-stream - -# rocky linux 8 -# -- job: - name: openstack-ansible-deploy-aio_lxc-rockylinux-8 - parent: openstack-ansible-deploy-aio - nodeset: rockylinux-8 - -- job: - name: openstack-ansible-deploy-infra_lxc-rockylinux-8 - parent: openstack-ansible-deploy-aio-infra - nodeset: rockylinux-8 - -- job: - name: openstack-ansible-deploy-hosts_distro_lxc-rockylinux-8 - parent: openstack-ansible-deploy-aio-hosts - nodeset: rockylinux-8 - -- job: - name: openstack-ansible-deploy-hosts_lxc-rockylinux-8 - parent: openstack-ansible-deploy-aio-hosts - nodeset: rockylinux-8 - -- job: - name: openstack-ansible-deploy-hosts_metal-rockylinux-8 - parent: openstack-ansible-deploy-aio-hosts - nodeset: rockylinux-8 - -- job: - name: openstack-ansible-deploy-aio_distro_lxc-rockylinux-8 - parent: openstack-ansible-deploy-aio-distro - nodeset: rockylinux-8 - -- job: - name: openstack-ansible-deploy-aio_ceph-rockylinux-8 - parent: openstack-ansible-deploy-aio - nodeset: rockylinux-8 - -- job: - name: openstack-ansible-deploy-aio_nfs-rockylinux-8 - parent: openstack-ansible-deploy-aio - nodeset: rockylinux-8 - -- job: - name: openstack-ansible-deploy-aio_distro_ceph-rockylinux-8 - parent: openstack-ansible-deploy-aio-distro - nodeset: rockylinux-8 - -- job: - name: openstack-ansible-upgrade-aio_lxc-rockylinux-8 - parent: openstack-ansible-deploy-aio - nodeset: rockylinux-8 - timeout: 10800 - -- job: - name: openstack-ansible-upgrade-infra_lxc-rockylinux-8 - parent: openstack-ansible-deploy-aio-infra - nodeset: rockylinux-8 - timeout: 10800 - -- job: - name: openstack-ansible-deploy-aio_metal-rockylinux-8 - parent: openstack-ansible-deploy-aio - nodeset: rockylinux-8 - -- job: - name: openstack-ansible-deploy-aio_telemetry_metal-rockylinux-8 - parent: openstack-ansible-deploy-aio - nodeset: rockylinux-8 - -- job: - name: openstack-ansible-deploy-aio_distro_metal-rockylinux-8 - parent: openstack-ansible-deploy-aio-distro - nodeset: rockylinux-8 - voting: false - -- job: - name: openstack-ansible-deploy-aio_nspawn-rockylinux-8 - parent: openstack-ansible-deploy-aio - nodeset: rockylinux-8 - -- job: - name: openstack-ansible-upgrade-aio_ceph-rockylinux-8 - parent: openstack-ansible-deploy-aio - nodeset: rockylinux-8 - timeout: 10800 - -- job: - name: openstack-ansible-upgrade-aio_metal-rockylinux-8 - parent: openstack-ansible-deploy-aio - nodeset: rockylinux-8 - timeout: 10800 - -- job: - name: openstack-ansible-deploy-hosts_lxc_overlayfs-rockylinux-8 - parent: openstack-ansible-deploy-aio - nodeset: rockylinux-8 - # debian bullseye - job: diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index 2bd1bd6c91..c01e93a351 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -39,19 +39,15 @@ name: openstack-ansible-deploy-aio_lxc-jobs check: jobs: - - openstack-ansible-deploy-aio_lxc-centos-8-stream - openstack-ansible-deploy-aio_lxc-centos-9-stream - openstack-ansible-deploy-aio_lxc-debian-bullseye - - openstack-ansible-deploy-aio_lxc-rockylinux-8 - openstack-ansible-deploy-aio_lxc-ubuntu-focal - openstack-ansible-deploy-aio_lxc-ubuntu-jammy: voting: false gate: jobs: - - openstack-ansible-deploy-aio_lxc-centos-8-stream - openstack-ansible-deploy-aio_lxc-centos-9-stream - openstack-ansible-deploy-aio_lxc-debian-bullseye - - openstack-ansible-deploy-aio_lxc-rockylinux-8 - openstack-ansible-deploy-aio_lxc-ubuntu-focal periodic: jobs: @@ -62,7 +58,7 @@ name: openstack-ansible-upgrade-infra_lxc-jobs check: jobs: - - openstack-ansible-upgrade-infra_lxc-centos-8-stream: + - openstack-ansible-upgrade-infra_lxc-centos-9-stream: voting: false - openstack-ansible-upgrade-infra_lxc-ubuntu-focal gate: @@ -73,7 +69,7 @@ name: openstack-ansible-upgrade-aio_metal-jobs check: jobs: - - openstack-ansible-upgrade-aio_metal-centos-8-stream: + - openstack-ansible-upgrade-aio_metal-centos-9-stream: voting: false - openstack-ansible-upgrade-aio_metal-ubuntu-focal gate: @@ -84,19 +80,15 @@ name: openstack-ansible-deploy-infra_lxc-jobs check: jobs: - - openstack-ansible-deploy-infra_lxc-centos-8-stream - openstack-ansible-deploy-infra_lxc-centos-9-stream - openstack-ansible-deploy-infra_lxc-debian-bullseye - - openstack-ansible-deploy-infra_lxc-rockylinux-8 - openstack-ansible-deploy-infra_lxc-ubuntu-focal - openstack-ansible-deploy-infra_lxc-ubuntu-jammy: voting: false gate: jobs: - - openstack-ansible-deploy-infra_lxc-centos-8-stream - openstack-ansible-deploy-infra_lxc-centos-9-stream - openstack-ansible-deploy-infra_lxc-debian-bullseye - - openstack-ansible-deploy-infra_lxc-rockylinux-8 - openstack-ansible-deploy-infra_lxc-ubuntu-focal periodic: jobs: @@ -106,19 +98,15 @@ name: openstack-ansible-deploy-hosts_lxc-jobs check: jobs: - - openstack-ansible-deploy-hosts_lxc-centos-8-stream - openstack-ansible-deploy-hosts_lxc-centos-9-stream - openstack-ansible-deploy-hosts_lxc-debian-bullseye - - openstack-ansible-deploy-hosts_lxc-rockylinux-8 - openstack-ansible-deploy-hosts_lxc-ubuntu-focal - openstack-ansible-deploy-hosts_lxc-ubuntu-jammy: voting: false gate: jobs: - - openstack-ansible-deploy-hosts_lxc-centos-8-stream - openstack-ansible-deploy-hosts_lxc-centos-9-stream - openstack-ansible-deploy-hosts_lxc-debian-bullseye - - openstack-ansible-deploy-hosts_lxc-rockylinux-8 - openstack-ansible-deploy-hosts_lxc-ubuntu-focal periodic: jobs: @@ -128,19 +116,15 @@ name: openstack-ansible-deploy-hosts_metal-jobs check: jobs: - - openstack-ansible-deploy-hosts_metal-centos-8-stream - openstack-ansible-deploy-hosts_metal-centos-9-stream - openstack-ansible-deploy-hosts_metal-debian-bullseye - - openstack-ansible-deploy-hosts_metal-rockylinux-8 - openstack-ansible-deploy-hosts_metal-ubuntu-focal - openstack-ansible-deploy-hosts_metal-ubuntu-jammy: voting: false gate: jobs: - - openstack-ansible-deploy-hosts_metal-centos-8-stream - openstack-ansible-deploy-hosts_metal-centos-9-stream - openstack-ansible-deploy-hosts_metal-debian-bullseye - - openstack-ansible-deploy-hosts_metal-rockylinux-8 - openstack-ansible-deploy-hosts_metal-ubuntu-focal periodic: jobs: @@ -150,12 +134,12 @@ name: openstack-ansible-deploy-hosts_distro_lxc-jobs check: jobs: - - openstack-ansible-deploy-hosts_distro_lxc-centos-8-stream + - openstack-ansible-deploy-hosts_distro_lxc-centos-9-stream - openstack-ansible-deploy-hosts_distro_lxc-debian-bullseye - openstack-ansible-deploy-hosts_distro_lxc-ubuntu-focal gate: jobs: - - openstack-ansible-deploy-hosts_distro_lxc-centos-8-stream + - openstack-ansible-deploy-hosts_distro_lxc-centos-9-stream - openstack-ansible-deploy-hosts_distro_lxc-debian-bullseye - openstack-ansible-deploy-hosts_distro_lxc-ubuntu-focal @@ -163,9 +147,7 @@ name: openstack-ansible-deploy-aio_distro_lxc-jobs experimental: jobs: - - openstack-ansible-deploy-aio_distro_lxc-centos-8-stream - openstack-ansible-deploy-aio_distro_lxc-debian-bullseye - - openstack-ansible-deploy-aio_distro_lxc-rockylinux-8 - openstack-ansible-deploy-aio_distro_lxc-ubuntu-focal - project-template: @@ -173,50 +155,39 @@ check: jobs: - openstack-ansible-deploy-aio_metal-debian-bullseye - - openstack-ansible-deploy-aio_metal-centos-8-stream - openstack-ansible-deploy-aio_metal-centos-9-stream - openstack-ansible-deploy-aio_metal-ubuntu-focal - openstack-ansible-deploy-aio_metal-ubuntu-jammy: voting: false - - openstack-ansible-deploy-aio_metal-rockylinux-8 - - openstack-ansible-upgrade-aio_metal-centos-8-stream: + - openstack-ansible-upgrade-aio_metal-centos-9-stream: voting: false - openstack-ansible-upgrade-aio_metal-ubuntu-focal gate: jobs: - openstack-ansible-deploy-aio_metal-debian-bullseye - - openstack-ansible-deploy-aio_metal-centos-8-stream - openstack-ansible-deploy-aio_metal-centos-9-stream - openstack-ansible-deploy-aio_metal-ubuntu-focal - - openstack-ansible-deploy-aio_metal-rockylinux-8 - project-template: name: openstack-ansible-deploy-aio_telemetry_metal-jobs check: jobs: - - openstack-ansible-deploy-aio_telemetry_metal-centos-8-stream - openstack-ansible-deploy-aio_telemetry_metal-centos-9-stream - openstack-ansible-deploy-aio_telemetry_metal-debian-bullseye - - openstack-ansible-deploy-aio_telemetry_metal-rockylinux-8 - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-focal - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-jammy: voting: false gate: jobs: - - openstack-ansible-deploy-aio_telemetry_metal-centos-8-stream - openstack-ansible-deploy-aio_telemetry_metal-centos-9-stream - openstack-ansible-deploy-aio_telemetry_metal-debian-bullseye - - openstack-ansible-deploy-aio_telemetry_metal-rockylinux-8 - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-focal - project-template: name: openstack-ansible-deploy-aio_distro_metal-jobs check: jobs: - - openstack-ansible-deploy-aio_distro_metal-centos-8-stream - - openstack-ansible-deploy-aio_distro_metal-ubuntu-focal - gate: - jobs: + - openstack-ansible-deploy-aio_distro_metal-centos-9-stream - openstack-ansible-deploy-aio_distro_metal-ubuntu-focal experimental: jobs: @@ -274,8 +245,7 @@ - openstack-ansible-deploy-hosts_lxc_overlayfs-ubuntu-focal - openstack-ansible-deploy-hosts_lxc_btrfs-debian-bullseye - openstack-ansible-deploy-hosts_lxc_overlayfs-debian-bullseye - - openstack-ansible-deploy-hosts_lxc_overlayfs-rockylinux-8 - - openstack-ansible-deploy-hosts_lxc_overlayfs-centos-8-stream + - openstack-ansible-deploy-hosts_lxc_overlayfs-centos-9-stream gate: jobs: - openstack-ansible-deploy-hosts_lxc_zfs-ubuntu-focal @@ -283,8 +253,7 @@ - openstack-ansible-deploy-hosts_lxc_overlayfs-ubuntu-focal - openstack-ansible-deploy-hosts_lxc_btrfs-debian-bullseye - openstack-ansible-deploy-hosts_lxc_overlayfs-debian-bullseye - - openstack-ansible-deploy-hosts_lxc_overlayfs-rockylinux-8 - - openstack-ansible-deploy-hosts_lxc_overlayfs-centos-8-stream + - openstack-ansible-deploy-hosts_lxc_overlayfs-centos-9-stream - project-template: name: openstack-ansible-deploy-guide-jobs