From abe0b22c767444408a10c0c210aa3b70f319dc95 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Sat, 9 Jun 2018 17:20:35 +0200 Subject: [PATCH] Update all SHAs for milestone 3 This patch updates all the roles to the latest available stable SHA's, copies the release notes from the updated roles into the integrated repo, updates all the OpenStack Service SHA's, and updates the appropriate python requirements pins. We also had to make master branch install HEAD of tempest master: without it, all the sha bumps of keystone would fail in tempest, as there are discrepencies between latest keystone and 18.0.0 tempest (the pip installed version). In order to install tempest from master branch, the workaround in the gates is: - Keeping the same behavior as currently when not on master branch (installing tempest from pip packages) - Installing master of tempest without using enabling the repo build for everyone, until a new version of tempest is released with the patch [1] included. [1]: https://github.com/openstack/tempest/commit/7d2b636a30057ed8db8cfd4fe2248f509b3570f1 Depends-On: https://review.openstack.org/#/c/573398/ Depends-On: https://review.openstack.org/#/c/583955/ Change-Id: I1edfc43ac571198fcb592ae8e97dcc85d20940af --- global-requirement-pins.txt | 4 +- playbooks/defaults/repo_packages/gnocchi.yml | 2 +- .../defaults/repo_packages/nova_consoles.yml | 4 +- .../repo_packages/openstack_services.yml | 82 +++++++++---------- .../templates/user_variables.aio.yml.j2 | 24 ++++++ 5 files changed, 71 insertions(+), 45 deletions(-) diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt index f0df145d90..d91c55d228 100644 --- a/global-requirement-pins.txt +++ b/global-requirement-pins.txt @@ -9,6 +9,8 @@ ### These are pinned to ensure exactly the same behaviour forever! ### ### These pins are updated through the sources-branch-updater script ### ### +# Bumping pip to version 10 fails in tempest when trying to install +# packages with an empty list. pip==9.0.3 setuptools==39.2.0 -wheel==0.30.0 +wheel==0.31.1 diff --git a/playbooks/defaults/repo_packages/gnocchi.yml b/playbooks/defaults/repo_packages/gnocchi.yml index e0961504e8..e044081088 100644 --- a/playbooks/defaults/repo_packages/gnocchi.yml +++ b/playbooks/defaults/repo_packages/gnocchi.yml @@ -33,5 +33,5 @@ ## This service has a different stable branch strategy to the rest of OpenStack. ## The SHA is recorded here to make the SHA updating easier. gnocchi_git_repo: https://github.com/gnocchixyz/gnocchi -gnocchi_git_install_branch: 51ac20f06690f54933fb6f84ba3353ea0eae5170 # HEAD of "master" as of 31.03.2018 +gnocchi_git_install_branch: 534470ff1df218da78f52c52d41a1461f9510554 # HEAD of "master" as of 09.06.2018 gnocchi_git_project_group: gnocchi_all diff --git a/playbooks/defaults/repo_packages/nova_consoles.yml b/playbooks/defaults/repo_packages/nova_consoles.yml index 3a8f989db5..f83aa81e8b 100644 --- a/playbooks/defaults/repo_packages/nova_consoles.yml +++ b/playbooks/defaults/repo_packages/nova_consoles.yml @@ -27,11 +27,11 @@ ## NOVNC from source novncproxy_git_repo: https://github.com/novnc/noVNC -novncproxy_git_install_branch: 7d60e97cc98ed9462f1ae4da5b6c3f3a85cf981b # HEAD of "master" as of 31.03.2018 +novncproxy_git_install_branch: aaa2ecbd9520e55027a3dfbe857585b64e6b8532 # HEAD of "master" as of 09.06.2018 novncproxy_git_project_group: nova_console ## spice-html5 from source spicehtml5_git_repo: https://gitlab.freedesktop.org/spice/spice-html5.git -spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 31.03.2018 +spicehtml5_git_install_branch: fb21664f6b7cfd492a5625cc4c47f28c91486f12 # HEAD of "master" as of 09.06.2018 spicehtml5_git_project_group: nova_console diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 93dbe74870..94393176db 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -31,127 +31,127 @@ ## Global Requirements requirements_git_repo: https://git.openstack.org/openstack/requirements -requirements_git_install_branch: 424d60b9c94bcf9b674794b1ec739f8cb0c0978b # HEAD of "master" as of 31.03.2018 +requirements_git_install_branch: f629a2e6f17f2d666d4fe578e6c19518e1e9c0f4 # HEAD of "master" as of 03.07.2018 ## Aodh service aodh_git_repo: https://git.openstack.org/openstack/aodh -aodh_git_install_branch: e99c6f3e8ce6195323ccf2f3560d83561e0c861b # HEAD of "master" as of 31.03.2018 +aodh_git_install_branch: 179c8b798c5403f481ee2dd164f59f7477b82ef1 # HEAD of "master" as of 03.07.2018 aodh_git_project_group: aodh_all ## Barbican service barbican_git_repo: https://git.openstack.org/openstack/barbican -barbican_git_install_branch: b33fed4e5faca37f180b9e1988c044991da4accf # HEAD of "master" as of 31.03.2018 +barbican_git_install_branch: 5dea5cec130b59ecfb8d46435cd7eb3212894b4c # HEAD of "master" as of 03.07.2018 barbican_git_project_group: barbican_all ## Ceilometer service ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer -ceilometer_git_install_branch: 334109564538f1b0eec47ab0b33cd2b5be39d8a9 # HEAD of "master" as of 31.03.2018 +ceilometer_git_install_branch: c721cffb01c3903f20aa7d019e62f932208fbcb3 # HEAD of "master" as of 03.07.2018 ceilometer_git_project_group: ceilometer_all ## Cinder service cinder_git_repo: https://git.openstack.org/openstack/cinder -cinder_git_install_branch: 902719a46ed9b8f84f9753bd624ad59b5a968134 # HEAD of "master" as of 31.03.2018 +cinder_git_install_branch: 4bc1e5f6a33f66945b5a01e6d5b3d3688ae647d5 # HEAD of "master" as of 03.07.2018 cinder_git_project_group: cinder_all ## Designate service designate_git_repo: https://git.openstack.org/openstack/designate -designate_git_install_branch: 7a2adab56a922640cc47ecfdf83cd8f8209fca64 # HEAD of "master" as of 31.03.2018 +designate_git_install_branch: fa9ae37ca7c369ee0af4ac300ab1acc06e0efb10 # HEAD of "master" as of 03.07.2018 designate_git_project_group: designate_all ## Horizon Designate dashboard plugin designate_dashboard_git_repo: https://git.openstack.org/openstack/designate-dashboard -designate_dashboard_git_install_branch: 9d1c5d7e089383910d1a4374bf22cc89bb991b4d # HEAD of "master" as of 31.03.2018 +designate_dashboard_git_install_branch: 5f713170e6926ec92bfbca0f3bbd255b9fd93933 # HEAD of "master" as of 03.07.2018 designate_dashboard_git_project_group: horizon_all ## Dragonflow service dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow -dragonflow_git_install_branch: a5804afcb90f0b1029f8d091a0532a05a2001250 # HEAD of "master" as of 31.03.2018 +dragonflow_git_install_branch: 1d0bb1761d1a5425ef8bb62504351aec02695474 # HEAD of "master" as of 03.07.2018 dragonflow_git_project_group: neutron_all ## Glance service glance_git_repo: https://git.openstack.org/openstack/glance -glance_git_install_branch: 06158f69b989d64ab17584fbe630a314e7d279a9 # HEAD of "master" as of 31.03.2018 +glance_git_install_branch: 9a893e80c2a5ee665487ce73845a88946d65ade4 # HEAD of "master" as of 03.07.2018 glance_git_project_group: glance_all ## Heat service heat_git_repo: https://git.openstack.org/openstack/heat -heat_git_install_branch: 71a961bcd548a3fcccbb97448503e7568d87f4a8 # HEAD of "master" as of 31.03.2018 +heat_git_install_branch: 9e463f4af77513980b1fd215d5d2ad3bf7b979f9 # HEAD of "master" as of 03.07.2018 heat_git_project_group: heat_all ## Horizon Heat dashboard plugin heat_dashboard_git_repo: https://git.openstack.org/openstack/heat-dashboard -heat_dashboard_git_install_branch: e69e115ef40150bb08025df9e861bcc10b0ff6a6 # HEAD of "master" as of 31.03.2018 +heat_dashboard_git_install_branch: 9cc6e6112b183b9628181766359aa653b17bddc9 # HEAD of "master" as of 03.07.2018 heat_dashboard_git_project_group: horizon_all ## Horizon service horizon_git_repo: https://git.openstack.org/openstack/horizon -horizon_git_install_branch: 946ecea7b707d49b5ce5d56204aaf6073d33967e # HEAD of "master" as of 31.03.2018 +horizon_git_install_branch: e45811cc52d06e544db71dee60a4e68f7824729c # HEAD of "master" as of 03.07.2018 horizon_git_project_group: horizon_all ## Horizon Ironic dashboard plugin ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui -ironic_dashboard_git_install_branch: f1f11d53d7eea079077873b060bee735ea9225d8 # HEAD of "master" as of 31.03.2018 +ironic_dashboard_git_install_branch: 4823b8d76345897affa4d874a96aaa6e8b275c14 # HEAD of "master" as of 03.07.2018 ironic_dashboard_git_project_group: horizon_all ## Horizon Magnum dashboard plugin magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui -magnum_dashboard_git_install_branch: d78285db9dabec60468bc48dd75a39ac988d7f03 # HEAD of "master" as of 31.03.2018 +magnum_dashboard_git_install_branch: afd0cb6c8cc2477bad274b0d7c4635a24f4222b9 # HEAD of "master" as of 03.07.2018 magnum_dashboard_git_project_group: horizon_all ## Horizon LBaaS dashboard plugin neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard -neutron_lbaas_dashboard_git_install_branch: e6da9ade502458258c565e36813f7d099234eba2 # HEAD of "master" as of 31.03.2018 +neutron_lbaas_dashboard_git_install_branch: dde6dfb2eba8eb2f1d9cd61986032b512330b281 # HEAD of "master" as of 03.07.2018 neutron_lbaas_dashboard_git_project_group: horizon_all ## Horizon FWaaS dashboard plugin -neutron_fwaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-fwaas-dashboard -neutron_fwaas_dashboard_git_install_branch: f85040ff654582f61721a6767d4643783e63d9d1 # HEAD of "master" as of 31.03.2018 +neutron_fwaas_dashboard_git_repo: https://git.openstack.org//openstack/neutron-fwaas-dashboard +neutron_fwaas_dashboard_git_install_branch: df7e11ff377c85486f44168975269b70fda5a3b2 # HEAD of "master" as of 03.07.2018 neutron_fwaas_dashboard_git_project_group: horizon_all ## Horizon Sahara dashboard plugin sahara_dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard -sahara_dashboard_git_install_branch: 0f83666144b98c4267f615b0ad4b442e0d619ca5 # HEAD of "master" as of 31.03.2018 +sahara_dashboard_git_install_branch: 0c10d0825f0d90505960fa72ffbafc4b8110b08d # HEAD of "master" as of 03.07.2018 sahara_dashboard_git_project_group: horizon_all ## Keystone service keystone_git_repo: https://git.openstack.org/openstack/keystone -keystone_git_install_branch: a6adc72e3e7ff4ff0bff0702e69ebd8f697d6261 # HEAD of "master" as of 31.03.2018 +keystone_git_install_branch: bc7eeff0dd6cd9329c66c8ef07e5ea63f5356397 # HEAD of "master" as of 03.07.2018 keystone_git_project_group: keystone_all ## Neutron service neutron_git_repo: https://git.openstack.org/openstack/neutron -neutron_git_install_branch: 44be070a3e459d6b254cf46e0c878679aa30350f # HEAD of "master" as of 31.03.2018 +neutron_git_install_branch: 878ac9b4633849cafa28d6e2df538d3df5b4ba88 # HEAD of "master" as of 03.07.2018 neutron_git_project_group: neutron_all neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas -neutron_lbaas_git_install_branch: ac720b2a49720fb99e4189f93d5a83cfb295ccb3 # HEAD of "master" as of 31.03.2018 +neutron_lbaas_git_install_branch: fd55125641c9458369842f72e1fc65060468ef5f # HEAD of "master" as of 03.07.2018 neutron_lbaas_git_project_group: neutron_all neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas -neutron_vpnaas_git_install_branch: 1f9b95d6dbe644af7ec8782ca80d54a843ded016 # HEAD of "master" as of 31.03.2018 +neutron_vpnaas_git_install_branch: 83db537dc68716954d25cf528bb076381563afa1 # HEAD of "master" as of 03.07.2018 neutron_vpnaas_git_project_group: neutron_all neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas -neutron_fwaas_git_install_branch: d9c52bcd54881d336cf1d5a74b4ed3697a1223fe # HEAD of "master" as of 31.03.2018 +neutron_fwaas_git_install_branch: 4b4db7e98c469bc513ed3d0f3dfd1c4c99271dc6 # HEAD of "master" as of 03.07.2018 neutron_fwaas_git_project_group: neutron_all neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing -neutron_dynamic_routing_git_install_branch: 008517ea02d119a073ca76d2863f01bec964ae96 # HEAD of "master" as of 31.03.2018 +neutron_dynamic_routing_git_install_branch: 93a8b15840c945a497eb886a16e2dbdd88e76f59 # HEAD of "master" as of 03.07.2018 neutron_dynamic_routing_git_project_group: neutron_all networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico -networking_calico_git_install_branch: ebfbf267ab12271ca68412e22a41b2c8e9c49e40 # HEAD of "master" as of 31.03.2018 +networking_calico_git_install_branch: cc24d10f5af45a1b7b39d8176bd0c7819d52bb9e # HEAD of "master" as of 03.07.2018 networking_calico_git_project_group: neutron_all # ODL is frozen until further notice due to @@ -167,92 +167,92 @@ networking_bgpvpn_git_install_branch: 3b93ddacd390d92fb144e5660324d4da064ad9a4 # networking_bgpvpn_git_project_group: neutron_all networking_sfc_git_repo: https://git.openstack.org/openstack/networking-sfc -networking_sfc_git_install_branch: ec8272bd177d3f733286d03cb33501daede926ef # HEAD of "master" as of 31.03.2018 +networking_sfc_git_install_branch: 379fcd5cfcb7a71e7dbbe969da0255bc3ff09a33 # HEAD of "master" as of 03.07.2018 networking_sfc_git_project_group: neutron_all ## Nova service nova_git_repo: https://git.openstack.org/openstack/nova -nova_git_install_branch: c683518ecb085a51ac0b6557edfe506ac01cbe06 # HEAD of "master" as of 31.03.2018 +nova_git_install_branch: df5c253b58f82dcca7f59ac34fc8b8b51e824ca4 # HEAD of "master" as of 03.07.2018 nova_git_project_group: nova_all ## PowerVM Virt Driver nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm -nova_powervm_git_install_branch: b925fcba37dc991e8b8dcbde65347a12022481dd # HEAD of "master" as of 31.03.2018 +nova_powervm_git_install_branch: 4db7cda136bbbc93f1c278c17bdd8b63af3b17d7 # HEAD of "master" as of 03.07.2018 nova_powervm_git_project_group: nova_all ## LXD Virt Driver nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd -nova_lxd_git_install_branch: 47afcf108a0fb7de234b6fa9607503541ee66184 # HEAD of "master" as of 31.03.2018 +nova_lxd_git_install_branch: a02fce0d312fa5c22ea684b54fb29895fcd8267d # HEAD of "master" as of 03.07.2018 nova_lxd_git_project_group: nova_all ## Sahara service sahara_git_repo: https://git.openstack.org/openstack/sahara -sahara_git_install_branch: 6e607903154d9f1420e245098244e810a1f59497 # HEAD of "master" as of 31.03.2018 +sahara_git_install_branch: b23abe2f96b591db5f6d8fe1c1f08bbd22c7666d # HEAD of "master" as of 03.07.2018 sahara_git_project_group: sahara_all ## Swift service swift_git_repo: https://git.openstack.org/openstack/swift -swift_git_install_branch: 9b4c978f99c993775e917f9ddec7cabb25c83c6d # HEAD of "master" as of 31.03.2018 +swift_git_install_branch: 3378a487339d894d7c751e911132fdd094663da5 # HEAD of "master" as of 03.07.2018 swift_git_project_group: swift_all ## Swift3 middleware swift_swift3_git_repo: https://git.openstack.org/openstack/swift3 -swift_swift3_git_install_branch: 520b8888343a96ef0253af8701b45f0bd5238264 # HEAD of "master" as of 31.03.2018 +swift_swift3_git_install_branch: 90db5d1510b2a770387961e7bf0fbeae8101ba45 # HEAD of "master" as of 03.07.2018 swift_swift3_git_project_group: swift_all ## Ironic service ironic_git_repo: https://git.openstack.org/openstack/ironic -ironic_git_install_branch: 5816e50766e3ed9e08ff7fd7176a85b2ab835659 # HEAD of "master" as of 31.03.2018 +ironic_git_install_branch: 08e70c45288f1ec8a5ecc661f8bbef91d3b257c6 # HEAD of "master" as of 03.07.2018 ironic_git_project_group: ironic_all ## Magnum service magnum_git_repo: https://git.openstack.org/openstack/magnum -magnum_git_install_branch: 445853cff17b6c1693b0567e4e4f11621118b846 # HEAD of "master" as of 31.03.2018 +magnum_git_install_branch: efe1fabd378c9e23e5ec6c492ac47b034839b244 # HEAD of "master" as of 03.07.2018 magnum_git_project_group: magnum_all ## Trove service trove_git_repo: https://git.openstack.org/openstack/trove -trove_git_install_branch: e96c0093cd7419252242a4f2b1435436f65697f7 # HEAD of "master" as of 31.03.2018 +trove_git_install_branch: f025cf78d0e227cbcc8baec3a2d39a61ac4ac6c9 # HEAD of "master" as of 03.07.2018 trove_git_project_group: trove_all ## Horizon Trove dashboard plugin trove_dashboard_git_repo: https://git.openstack.org/openstack/trove-dashboard -trove_dashboard_git_install_branch: aaf4f2642f1e7c48f29a03a0959da2549db3f04b # HEAD of "master" as of 31.03.2018 +trove_dashboard_git_install_branch: 06d17bc5fb683823326c81aeb2056a81af19d084 # HEAD of "master" as of 03.07.2018 trove_dashboard_git_project_group: horizon_all ## Octavia service octavia_git_repo: https://git.openstack.org/openstack/octavia -octavia_git_install_branch: 592d1790c7c4515bc9dd7d9d851c88c4c8228ec3 # HEAD of "master" as of 31.03.2018 +octavia_git_install_branch: a52d7c6ef930133efde9d5a22ecca5f26e4cfc92 # HEAD of "master" as of 03.07.2018 octavia_git_project_group: octavia_all ## Molteniron service molteniron_git_repo: https://git.openstack.org/openstack/molteniron -molteniron_git_install_branch: 094276cda77d814d07ad885e7d63de8d1243750a # HEAD of "master" as of 31.03.2018 +molteniron_git_install_branch: 094276cda77d814d07ad885e7d63de8d1243750a # HEAD of "master" as of 03.07.2018 molteniron_git_project_group: molteniron_all ## Tacker service tacker_git_repo: https://git.openstack.org/openstack/tacker -tacker_git_install_branch: 6bea5c85f7f63acc841f323755fb508ec1e03422 # HEAD of "master" as of 31.03.2018 +tacker_git_install_branch: 7d0c22524ac8352a50af2e017eed4b5be28d4c31 # HEAD of "master" as of 03.07.2018 tacker_git_project_group: tacker_all ## Congress service congress_git_repo: https://git.openstack.org/openstack/congress -congress_git_install_branch: c6114ddf2209667b52c683bfc65601b3418da998 # HEAD of "master" as of 31.03.2018 +congress_git_install_branch: 270db006cc6cde99a2ad66ff40e05927ce217d92 # HEAD of "master" as of 03.07.2018 congress_git_project_group: congress_all ## Horizon Octavia dashboard plugin octavia_dashboard_git_repo: https://git.openstack.org/openstack/octavia-dashboard -octavia_dashboard_git_install_branch: 5a0b2b1af2a898539daa7bc4bdfb1c0c129af030 # HEAD of "master" as of 31.03.2018 +octavia_dashboard_git_install_branch: 4f7a5591ae8dd61b25af7f746f20d8f058aa991c # HEAD of "master" as of 03.07.2018 octavia_dashboard_git_project_group: horizon_all diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 index d4eb1897cb..60d694582a 100644 --- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 @@ -185,3 +185,27 @@ repo_nginx_pypi_upstream: "{{ _pypi_wheel_mirror.stdout_lines[0] | netloc }}" repo_build_pip_extra_indexes: - "{{ _pypi_wheel_mirror.stdout_lines[1] }}" {% endif %} + +{% raw %} +# We now have access to the branchname in testing variables. +findgitreview: + files: + - ".gitreview" + paths: + - "{{ playbook_dir }}" + - "{{ playbook_dir }}/../" + - "{{ playbook_dir }}/../../" +gitreviewfile: "{{ lookup('first_found', findgitreview) }}" +currentbranch: "{{ lookup('ini', 'defaultbranch section=gerrit file=' ~ gitreviewfile) | default('master',True) }}" + +# This is used to override the group vars for the AIO. +# Goals: +# 1) Do not build tempest in repo build (No change) +# 2) Use developer mode to install tempest from git on master +# 3) Do not use developer mode on other branches to install tempest from pip packages on stable branches. +# These two lines can be removed when tempest 18.0.1 or above is released, including +# https://github.com/openstack/tempest/commit/7d2b636a30057ed8db8cfd4fe2248f509b3570f1#diff-5c9acbc10dc9d27b47985cd74ab100f6 +tempest_developer_mode: "{{ currentbranch == 'master' }}" +tempest_developer_constraints: + - "git+https://git.openstack.org/openstack/tempest@master#egg=tempest" +{% endraw %}