From 30c59b297dff0c426134f4880e7732943f157840 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 19 May 2016 21:23:38 +0100 Subject: [PATCH] Updates all SHAs for Newton 2016-05-19 This patch updates all the roles to the latest available stable SHA's, updates all the OpenStack Service SHA's and also updates the appropriate python requirements pins. Note that 'ceilometer_api' has been removed from the standard tempest testing in the integrated build as the tests have been removed from the tempest repository with I0775bcc15dc9cbae6e075fe92f44b5f6c9b9d5d2 The ceilometer testing will have to be re-introduced using the tempest plugin framework. Change-Id: Iea7e4213893fb331c410c2d09e3258493f4643f3 --- .../repo_packages/openstack_other.yml | 6 ++-- .../repo_packages/openstack_services.yml | 32 +++++++++---------- playbooks/inventory/group_vars/hosts.yml | 4 +-- requirements.txt | 4 +-- scripts/run-tempest.sh | 2 +- scripts/scripts-library.sh | 2 +- scripts/sources-branch-updater.sh | 10 +++--- 7 files changed, 31 insertions(+), 29 deletions(-) diff --git a/playbooks/defaults/repo_packages/openstack_other.yml b/playbooks/defaults/repo_packages/openstack_other.yml index e42973991a..6d807f2e91 100644 --- a/playbooks/defaults/repo_packages/openstack_other.yml +++ b/playbooks/defaults/repo_packages/openstack_other.yml @@ -27,17 +27,17 @@ ## Tempest service tempest_git_repo: https://git.openstack.org/openstack/tempest -tempest_git_install_branch: d1c4d60457210466894f39b7f72f04653504d882 # HEAD of "master" as of 22.04.2016 +tempest_git_install_branch: c1513b71279604a58e2f6e40127b8b32eb1f7e93 # HEAD of "master" as of 19.05.2016 tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}" ## NOVNC from source novncproxy_git_repo: https://github.com/kanaka/novnc -novncproxy_git_install_branch: 8b0a0f6637fbc5102da64e26ccaa52de8df7186c # HEAD of "master" as of 22.04.2016 +novncproxy_git_install_branch: f52105bc88ebd18d5cb3fba817173e99600cdc3f # HEAD of "master" as of 19.05.2016 novncproxy_git_dest: "/opt/novnc_{{ novncproxy_git_install_branch | replace('/', '_') }}" ## spice-html5 from source spicehtml5_git_repo: https://github.com/SPICE/spice-html5 -spicehtml5_git_install_branch: ab73d009487c8afd4def39b54a422499b4c13c40 # HEAD of "master" as of 22.04.2016 +spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 19.05.2016 spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}" diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 592b1eff9b..22ef1090f6 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -31,88 +31,88 @@ ## Global Requirements requirements_git_repo: https://git.openstack.org/openstack/requirements -requirements_git_install_branch: 978e1cf5e908ea63c9617054356f633255f67402 # HEAD of "master" as of 22.04.2016 +requirements_git_install_branch: f724bca6c907122f53069dd6a6b5c5f56bd76a64 # HEAD of "master" as of 19.05.2016 requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}" ## Aodh service aodh_git_repo: https://git.openstack.org/openstack/aodh -aodh_git_install_branch: aed9a3d8824c1eb0a219d0cd2bb4e2ddf91afd5c # HEAD of "master" as of 22.04.2016 +aodh_git_install_branch: 1c1064b6d447aa0186cbd9099dc84d7c34f60405 # HEAD of "master" as of 19.05.2016 aodh_git_dest: "/opt/aodh_{{ aodh_git_install_branch | replace('/', '_') }}" ## Ceilometer service ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer -ceilometer_git_install_branch: 47b7b7720e004f15bcb6809148029122cd01960d # HEAD of "master" as of 22.04.2016 +ceilometer_git_install_branch: 23978d7a7944a3a822587b16aeba946cb4d34845 # HEAD of "master" as of 19.05.2016 ceilometer_git_dest: "/opt/ceilometer_{{ceilometer_git_install_branch | replace('/', '_') }}" ## Cinder service cinder_git_repo: https://git.openstack.org/openstack/cinder -cinder_git_install_branch: 3ec6a6b791f132e6e42b1bfad2276cca2df7b368 # HEAD of "master" as of 22.04.2016 +cinder_git_install_branch: cb0504e24f80c98c662081f74b7e7c2351c9e06c # HEAD of "master" as of 19.05.2016 cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}" ## Glance service glance_git_repo: https://git.openstack.org/openstack/glance -glance_git_install_branch: 2fc6ff3f30a585a9530b46742ddef29a4f1129bd # HEAD of "master" as of 22.04.2016 +glance_git_install_branch: 67f4866fb232434ec3b22df71b06f7cd29365949 # HEAD of "master" as of 19.05.2016 glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}" ## Heat service heat_git_repo: https://git.openstack.org/openstack/heat -heat_git_install_branch: bc6c4a271edef2ac2183855bb17885156db893f3 # HEAD of "master" as of 22.04.2016 +heat_git_install_branch: d4445e15141aad03bba035d475629200a7ef3298 # HEAD of "master" as of 19.05.2016 heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}" ## Horizon service horizon_git_repo: https://git.openstack.org/openstack/horizon -horizon_git_install_branch: b3e0ddcb7527019b78119cd30cf8dd27169cd32d # HEAD of "master" as of 22.04.2016 +horizon_git_install_branch: 6ec5dd3b5327df4d51c5c9a396656365918258d8 # HEAD of "master" as of 19.05.2016 horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}" ## Horizon LBaaS dashboard plugin neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard -neutron_lbaas_dashboard_git_install_branch: 528567509debcb9165bcf7bf675d31bde5d36c00 # HEAD of "master" as of 27.04.2016 +neutron_lbaas_dashboard_git_install_branch: 528567509debcb9165bcf7bf675d31bde5d36c00 # HEAD of "master" as of 19.05.2016 neutron_lbaas_dashboard_git_dest: "/opt/neutron_lbaas_dashboard_{{ neutron_lbaas_dashboard_git_install_branch | replace('/', '_') }}" ## Keystone service keystone_git_repo: https://git.openstack.org/openstack/keystone -keystone_git_install_branch: 6d8c504fb1a1e999f199db618b67fcf648804cfc # HEAD of "master" as of 22.04.2016 +keystone_git_install_branch: 6635f8dcac2c14c24e1033ca7226671075161eb6 # HEAD of "master" as of 19.05.2016 keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}" ## Neutron service neutron_git_repo: https://git.openstack.org/openstack/neutron -neutron_git_install_branch: f2785fc7975bc3e464eef1cf013708df095fa204 # HEAD of "master" as of 22.04.2016 +neutron_git_install_branch: 79c1d7efc1a964836a98339e1e820ab6ebc5570e # HEAD of "master" as of 19.05.2016 neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}" neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas -neutron_lbaas_git_install_branch: 2698ed4f930a0e1b1aaee62ea63a55247af5f777 # HEAD of "master" as of 22.04.2016 +neutron_lbaas_git_install_branch: 0033ab1d00a342bb0627a9e44b5140f389883855 # HEAD of "master" as of 19.05.2016 neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}" neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas -neutron_vpnaas_git_install_branch: 9fc64611e53ae6ab514ed044f9e35c1b4ff6b7b7 # HEAD of "master" as of 22.04.2016 +neutron_vpnaas_git_install_branch: 5a7883bdf5c17ea5440c1f3dcdc2fbc065fc13f1 # HEAD of "master" as of 19.05.2016 neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}" neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas -neutron_fwaas_git_install_branch: fadfe86516de7982c86de4dd1a0d275d0a6c84f7 # HEAD of "master" as of 22.04.2016 +neutron_fwaas_git_install_branch: fadfe86516de7982c86de4dd1a0d275d0a6c84f7 # HEAD of "master" as of 19.05.2016 neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}" ## Nova service nova_git_repo: https://git.openstack.org/openstack/nova -nova_git_install_branch: e1522c1d8635377172a25e21ec18710d3ca446e6 # HEAD of "master" as of 22.04.2016 +nova_git_install_branch: 813787644bd11ffb8bdf46a547bd25982d995dea # HEAD of "master" as of 19.05.2016 nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}" ## Swift service swift_git_repo: https://git.openstack.org/openstack/swift -swift_git_install_branch: 40eace99c3f5833af43a366dad951faff2c34321 # HEAD of "master" as of 19.05.2016 +swift_git_install_branch: 4f9d9eab7fdf7c85c3ad1fc884464d4df952118d # HEAD of "master" as of 19.05.2016 swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}" ## Ironic service ironic_git_repo: https://git.openstack.org/openstack/ironic -ironic_git_install_branch: 6be9976257c9a56d7f9913b619ec40186228176d # HEAD of "master" as of 22.04.2016 +ironic_git_install_branch: bb42652d709a82aecb93f1d77bfbcb7e1d027d06 # HEAD of "master" as of 19.05.2016 ironic_git_dest: "/opt/ironic_{{ ironic_git_install_branch | replace('/', '_') }}" diff --git a/playbooks/inventory/group_vars/hosts.yml b/playbooks/inventory/group_vars/hosts.yml index 83eb8d11bd..93fa9ed103 100644 --- a/playbooks/inventory/group_vars/hosts.yml +++ b/playbooks/inventory/group_vars/hosts.yml @@ -70,8 +70,8 @@ pip_links: # These are pinned to ensure exactly the same behaviour forever! # These pins are updated through the sources-branch-updater script pip_packages: - - pip==8.1.1 - - setuptools==20.9.0 + - pip==8.1.2 + - setuptools==21.1.0 - wheel==0.29.0 ## Memcached options diff --git a/requirements.txt b/requirements.txt index 966d88555f..cfc7c5f623 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,6 @@ PrettyTable>=0.7,<0.8 # scripts/inventory-manage.py ### These are pinned to ensure exactly the same behaviour forever! ### ### These pins are updated through the sources-branch-updater script ### ### -pip==8.1.1 -setuptools==20.9.0 +pip==8.1.2 +setuptools==21.1.0 wheel==0.29.0 diff --git a/scripts/run-tempest.sh b/scripts/run-tempest.sh index 54fb1f981d..8d79d66135 100755 --- a/scripts/run-tempest.sh +++ b/scripts/run-tempest.sh @@ -22,7 +22,7 @@ export TEMPEST_SCRIPT_PATH=${TEMPEST_SCRIPT_PATH:-/opt/openstack_tempest_gate.sh ## TODO(someone) this needs to be changed back to the normal tests once someone ## is able to dig into tempest/the updated/deprecated config(s). This test should ## go back to being the scenario tests. -export TEMPEST_SCRIPT_PARAMETERS=${TEMPEST_SCRIPT_PARAMETERS:-"scenario heat_api cinder_backup ceilometer_api"} +export TEMPEST_SCRIPT_PARAMETERS=${TEMPEST_SCRIPT_PARAMETERS:-"scenario heat_api cinder_backup"} export RUN_TEMPEST_OPTS=${RUN_TEMPEST_OPTS:-'--serial'} export TESTR_OPTS=${TESTR_OPTS:-''} diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh index 906db64e9d..ca47fbb670 100755 --- a/scripts/scripts-library.sh +++ b/scripts/scripts-library.sh @@ -21,7 +21,7 @@ MAX_RETRIES=${MAX_RETRIES:-5} REPORT_DATA=${REPORT_DATA:-""} ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:-""} STARTTIME="${STARTTIME:-$(date +%s)}" -PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.1 setuptools==20.9.0 wheel==0.29.0 '} +PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==21.1.0 wheel==0.29.0 '} # The default SSHD configuration has MaxSessions = 10. If a deployer changes # their SSHD config, then the ANSIBLE_FORKS may be set to a higher number. We diff --git a/scripts/sources-branch-updater.sh b/scripts/sources-branch-updater.sh index fa3259691a..6152117e38 100755 --- a/scripts/sources-branch-updater.sh +++ b/scripts/sources-branch-updater.sh @@ -249,13 +249,15 @@ if [[ "${OSA_BRANCH}" != "master" ]]; then echo "Updating the release version..." currentversion=$(awk '/openstack_release/ {print $2}' playbooks/inventory/group_vars/all.yml) - # split the version into an array - versionarray=( ${currentversion//./ } ) + # Extract the required version info + major_version=$( echo ${currentversion} | cut -d. -f1 ) + minor_version=$( echo ${currentversion} | cut -d. -f2 ) + patch_version=$( echo ${currentversion} | cut -d. -f3 ) # increment the patch version - versionarray[2]=((versionarray[2]++)) + patch_version=$(( patch_version + 1 )) - sed -i .bak "s/${currentversion}/${versionarray[0]}.${versionarray[1]}.${versionarray[2]}/" playbooks/inventory/group_vars/all.yml + sed -i .bak "s/${currentversion}/${major_version}.${minor_version}.${patch_version}/" playbooks/inventory/group_vars/all.yml else echo "Skipping the release version update as we're working on the master branch" fi