From 8ac067890d4affe77de51b3b82cc03590e738b4f Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Fri, 10 Aug 2018 15:50:29 +0200 Subject: [PATCH] Switch previous release of master from 'queens' to 'rocky' It also calculates the releases with the emit releses script for fs047 Depends-On: Ic578de2237f9a43ff4fcd24141802a49a06be59c Depends-On: https://review.openstack.org/#/c/605989/ Closes-Bug: 1792892 Change-Id: Ic1aea1052a9518999f0f02539459eeef516f9654 --- .../templates/oooq_common_functions.sh.j2 | 3 +- .../tripleo-ci/templates/toci_gate_test.sh.j2 | 2 +- .../emit_releases_file/emit_releases_file.py | 4 -- .../emit_releases_file/test_release_name.py | 56 +++++++++++++++++-- .../test_unsupported_upgrades.py | 2 +- scripts/oooq_common_functions.sh | 3 +- toci_gate_test.sh | 2 +- 7 files changed, 57 insertions(+), 15 deletions(-) diff --git a/playbooks/tripleo-ci/templates/oooq_common_functions.sh.j2 b/playbooks/tripleo-ci/templates/oooq_common_functions.sh.j2 index 7975448fa..e60e316a3 100644 --- a/playbooks/tripleo-ci/templates/oooq_common_functions.sh.j2 +++ b/playbooks/tripleo-ci/templates/oooq_common_functions.sh.j2 @@ -19,8 +19,7 @@ function previous_release_mixed_upgrade_case { local release="${1:-master}" case "${release}" in ''|master|promotion-testing-hash-master) - # NOTE: we need to update this when we cut a stable branch - echo "queens" + echo "rocky" ;; stein|promotion-testing-hash-stein) echo "rocky" diff --git a/playbooks/tripleo-ci/templates/toci_gate_test.sh.j2 b/playbooks/tripleo-ci/templates/toci_gate_test.sh.j2 index c13fbe511..cf51c0d90 100755 --- a/playbooks/tripleo-ci/templates/toci_gate_test.sh.j2 +++ b/playbooks/tripleo-ci/templates/toci_gate_test.sh.j2 @@ -115,7 +115,7 @@ QUICKSTART_RELEASE="promotion-testing-hash-${QUICKSTART_RELEASE}" EMIT_RELEASES_EXTRA_ARGS="$EMIT_RELEASES_EXTRA_ARGS --is-periodic" {% endif %} -if [[ -f "$RELEASES_SCRIPT" ]] && [[ {{ featureset }} =~ 037|050|010|011 ]]; then +if [[ -f "$RELEASES_SCRIPT" ]] && [[ {{ featureset }} =~ 010|011|037|047|050 ]]; then python $RELEASES_SCRIPT \ --stable-release ${STABLE_RELEASE:-"master"} \ diff --git a/scripts/emit_releases_file/emit_releases_file.py b/scripts/emit_releases_file/emit_releases_file.py index 89084e252..4c526a629 100644 --- a/scripts/emit_releases_file/emit_releases_file.py +++ b/scripts/emit_releases_file/emit_releases_file.py @@ -140,8 +140,6 @@ def compose_releases_dictionary(stable_release, featureset, upgrade_from, if featureset.get('overcloud_upgrade'): logger.info('Doing an overcloud upgrade') deploy_release = get_relative_release(stable_release, -1) - if deploy_release == 'rocky': - deploy_release = 'queens' if deploy_release == 'newton': deploy_hash = get_dlrn_hash(deploy_release, NEWTON_HASH_NAME) else: @@ -162,8 +160,6 @@ def compose_releases_dictionary(stable_release, featureset, upgrade_from, elif featureset.get('undercloud_upgrade'): logger.info('Doing an undercloud upgrade') install_release = get_relative_release(stable_release, -1) - if install_release == 'rocky': - install_release = 'queens' install_hash = get_dlrn_hash(install_release, CURRENT_HASH_NAME) releases_dictionary['undercloud_install_release'] = install_release releases_dictionary['undercloud_install_hash'] = install_hash diff --git a/scripts/emit_releases_file/test_release_name.py b/scripts/emit_releases_file/test_release_name.py index 2f3139918..4ef5c97ba 100644 --- a/scripts/emit_releases_file/test_release_name.py +++ b/scripts/emit_releases_file/test_release_name.py @@ -11,7 +11,7 @@ import pytest 'undercloud_install_hash': 'current-tripleo', 'undercloud_target_release': 'master', 'undercloud_target_hash': 'current-tripleo', - 'overcloud_deploy_release': 'queens', + 'overcloud_deploy_release': 'rocky', 'overcloud_deploy_hash': 'old-current-tripleo', 'overcloud_target_release': 'master', 'overcloud_target_hash': 'current-tripleo', @@ -68,7 +68,7 @@ def test_overcloud_upgrade_is_n_minus_one_to_n(mock_get_hash, 'undercloud_install_hash': 'current-tripleo', 'undercloud_target_release': 'master', 'undercloud_target_hash': 'current-tripleo', - 'overcloud_deploy_release': 'queens', + 'overcloud_deploy_release': 'rocky', 'overcloud_deploy_hash': 'old-current-tripleo', 'overcloud_target_release': 'master', 'overcloud_target_hash': 'current-tripleo', @@ -185,7 +185,7 @@ def test_period_ffu_overcloud_upgrade_is_n_minus_three_to_n(mock_get_hash, @mock.patch('emit_releases_file.get_dlrn_hash') @pytest.mark.parametrize('stable_release,expected_releases', [ ('master', { - 'undercloud_install_release': 'queens', + 'undercloud_install_release': 'rocky', 'undercloud_install_hash': 'old-current-tripleo', 'undercloud_target_release': 'master', 'undercloud_target_hash': 'current-tripleo', @@ -194,6 +194,36 @@ def test_period_ffu_overcloud_upgrade_is_n_minus_three_to_n(mock_get_hash, 'overcloud_target_release': 'master', 'overcloud_target_hash': 'current-tripleo', }), + ('rocky', { + 'undercloud_install_release': 'queens', + 'undercloud_install_hash': 'old-current-tripleo', + 'undercloud_target_release': 'rocky', + 'undercloud_target_hash': 'current-tripleo', + 'overcloud_deploy_release': 'rocky', + 'overcloud_deploy_hash': 'current-tripleo', + 'overcloud_target_release': 'rocky', + 'overcloud_target_hash': 'current-tripleo', + }), + ('queens', { + 'undercloud_install_release': 'pike', + 'undercloud_install_hash': 'old-current-tripleo', + 'undercloud_target_release': 'queens', + 'undercloud_target_hash': 'current-tripleo', + 'overcloud_deploy_release': 'queens', + 'overcloud_deploy_hash': 'current-tripleo', + 'overcloud_target_release': 'queens', + 'overcloud_target_hash': 'current-tripleo', + }), + ('pike', { + 'undercloud_install_release': 'ocata', + 'undercloud_install_hash': 'old-current-tripleo', + 'undercloud_target_release': 'pike', + 'undercloud_target_hash': 'current-tripleo', + 'overcloud_deploy_release': 'pike', + 'overcloud_deploy_hash': 'current-tripleo', + 'overcloud_target_release': 'pike', + 'overcloud_target_hash': 'current-tripleo', + }), ]) def test_undercloud_upgrade_is_n_minus_one_to_n(mock_get_hash, stable_release, @@ -215,7 +245,7 @@ def test_undercloud_upgrade_is_n_minus_one_to_n(mock_get_hash, @mock.patch('emit_releases_file.get_dlrn_hash') @pytest.mark.parametrize('stable_release,expected_releases', [ ('master', { - 'undercloud_install_release': 'queens', + 'undercloud_install_release': 'rocky', 'undercloud_install_hash': 'old-current-tripleo', 'undercloud_target_release': 'master', 'undercloud_target_hash': 'current-tripleo', @@ -273,6 +303,24 @@ def test_period_undercloud_upgrade_is_n_minus_one_to_n(mock_get_hash, 'overcloud_deploy_hash': 'previous-current-tripleo', 'overcloud_target_release': 'queens', 'overcloud_target_hash': 'current-tripleo', + }), ('pike', { + 'undercloud_install_release': 'pike', + 'undercloud_install_hash': 'current-tripleo', + 'undercloud_target_release': 'pike', + 'undercloud_target_hash': 'current-tripleo', + 'overcloud_deploy_release': 'pike', + 'overcloud_deploy_hash': 'previous-current-tripleo', + 'overcloud_target_release': 'pike', + 'overcloud_target_hash': 'current-tripleo', + }), ('ocata', { + 'undercloud_install_release': 'ocata', + 'undercloud_install_hash': 'current-tripleo', + 'undercloud_target_release': 'ocata', + 'undercloud_target_hash': 'current-tripleo', + 'overcloud_deploy_release': 'ocata', + 'overcloud_deploy_hash': 'previous-current-tripleo', + 'overcloud_target_release': 'ocata', + 'overcloud_target_hash': 'current-tripleo', })]) def test_overcloud_update_target_is_hash(mock_get_hash, stable_release, diff --git a/scripts/emit_releases_file/test_unsupported_upgrades.py b/scripts/emit_releases_file/test_unsupported_upgrades.py index 66f95c9e4..69d6e3755 100644 --- a/scripts/emit_releases_file/test_unsupported_upgrades.py +++ b/scripts/emit_releases_file/test_unsupported_upgrades.py @@ -51,7 +51,7 @@ def test_overcloud_upgrades_has_to_be_mixed(upgrade_type): @pytest.mark.parametrize('stable_release', - ['ocata', 'pike', 'newton', 'master']) + ['ocata', 'pike', 'newton', 'rocky', 'master']) def test_ffu_overcloud_upgrade_only_supported_from_newton(stable_release): featureset = { 'mixed_upgrade': True, diff --git a/scripts/oooq_common_functions.sh b/scripts/oooq_common_functions.sh index 81f818737..4cb207c77 100644 --- a/scripts/oooq_common_functions.sh +++ b/scripts/oooq_common_functions.sh @@ -19,8 +19,7 @@ function previous_release_mixed_upgrade_case { local release="${1:-master}" case "${release}" in ''|master|promotion-testing-hash-master) - # NOTE: we need to update this when we cut a stable branch - echo "queens" + echo "rocky" ;; stein|promotion-testing-hash-stein) echo "rocky" diff --git a/toci_gate_test.sh b/toci_gate_test.sh index 9a82cb5eb..da581c896 100755 --- a/toci_gate_test.sh +++ b/toci_gate_test.sh @@ -199,7 +199,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do done -if [[ -f "$RELEASES_SCRIPT" ]] && [[ $FEATURESET_FILE =~ '037' || $FEATURESET_FILE =~ '050' || $FEATURESET_FILE =~ '010' || $FEATURESET_FILE =~ '011' ]]; then +if [[ -f "$RELEASES_SCRIPT" ]] && [[ $FEATURESET_FILE =~ 010|011|037|047|050 ]]; then python $RELEASES_SCRIPT \ --stable-release ${STABLE_RELEASE:-"master"} \