commit d69df19d22148f95ee5d38af22dfe93936e4407d Author: Bhagyashri Shewale Date: Tue Oct 13 18:55:18 2020 +0530 Add victoria support for emit_releases_file.py Adds victoria into the emit releases script [1]. [1]: https://projects.engineering.redhat.com/browse/TRIPLEOCI-230 Change-Id: I1758ff860cb36692af638be0cae3c3076dbd5b9e diff --git a/roles/run-test/templates/oooq_common_functions.sh.j2 b/roles/run-test/templates/oooq_common_functions.sh.j2 index 583371b..4123e56 100644 --- a/roles/run-test/templates/oooq_common_functions.sh.j2 +++ b/roles/run-test/templates/oooq_common_functions.sh.j2 @@ -19,6 +19,9 @@ function previous_release_mixed_upgrade_case { local release="${1:-master}" case "${release}" in ''|master|promotion-testing-hash-master) + echo "victoria" + ;; + victoria|promotion-testing-hash-victoria) echo "ussuri" ;; ussuri|promotion-testing-hash-ussuri) diff --git a/scripts/emit_releases_file/emit_releases_file.py b/scripts/emit_releases_file/emit_releases_file.py index bce1dd4..daca710 100644 --- a/scripts/emit_releases_file/emit_releases_file.py +++ b/scripts/emit_releases_file/emit_releases_file.py @@ -48,6 +48,7 @@ RELEASES = [ 'stein', 'train', 'ussuri', + 'victoria', 'master', ] # Define long term releases diff --git a/scripts/emit_releases_file/test_release_name.py b/scripts/emit_releases_file/test_release_name.py index e872598..ffa9e28 100644 --- a/scripts/emit_releases_file/test_release_name.py +++ b/scripts/emit_releases_file/test_release_name.py @@ -40,7 +40,7 @@ def hash_mock_setup(): 'undercloud_install_hash': 'current-tripleo', 'undercloud_target_release': 'master', 'undercloud_target_hash': 'current-tripleo', - 'overcloud_deploy_release': 'ussuri', + 'overcloud_deploy_release': 'victoria', 'overcloud_deploy_hash': 'previous-current-tripleo', 'overcloud_target_release': 'master', 'overcloud_target_hash': 'current-tripleo', @@ -53,6 +53,25 @@ def hash_mock_setup(): }, ), ( + 'victoria', + { + 'undercloud_install_release': 'victoria', + 'undercloud_install_hash': 'current-tripleo', + 'undercloud_target_release': 'victoria', + 'undercloud_target_hash': 'current-tripleo', + 'overcloud_deploy_release': 'ussuri', + 'overcloud_deploy_hash': 'previous-current-tripleo', + 'overcloud_target_release': 'victoria', + 'overcloud_target_hash': 'current-tripleo', + 'standalone_deploy_release': 'victoria', + 'standalone_deploy_newest_hash': 'current', + 'standalone_deploy_hash': 'current-tripleo', + 'standalone_target_release': 'victoria', + 'standalone_target_newest_hash': 'current', + 'standalone_target_hash': 'current-tripleo', + }, + ), + ( 'ussuri', { 'undercloud_install_release': 'ussuri', @@ -168,7 +187,7 @@ def test_overcloud_upgrade_is_n_minus_one_to_n( 'undercloud_install_hash': 'current-tripleo', 'undercloud_target_release': 'master', 'undercloud_target_hash': 'current-tripleo', - 'overcloud_deploy_release': 'ussuri', + 'overcloud_deploy_release': 'victoria', 'overcloud_deploy_hash': 'previous-current-tripleo', 'overcloud_target_release': 'master', 'overcloud_target_hash': 'current-tripleo', @@ -181,6 +200,25 @@ def test_overcloud_upgrade_is_n_minus_one_to_n( }, ), ( + 'victoria', + { + 'undercloud_install_release': 'victoria', + 'undercloud_install_hash': 'current-tripleo', + 'undercloud_target_release': 'victoria', + 'undercloud_target_hash': 'current-tripleo', + 'overcloud_deploy_release': 'ussuri', + 'overcloud_deploy_hash': 'previous-current-tripleo', + 'overcloud_target_release': 'victoria', + 'overcloud_target_hash': 'current-tripleo', + 'standalone_deploy_release': 'victoria', + 'standalone_deploy_newest_hash': 'current', + 'standalone_deploy_hash': 'current-tripleo', + 'standalone_target_release': 'victoria', + 'standalone_target_newest_hash': 'current', + 'standalone_target_hash': 'current-tripleo', + }, + ), + ( 'ussuri', { 'undercloud_install_release': 'ussuri', @@ -405,7 +443,7 @@ def test_period_ffu_overcloud_upgrade_is_n_minus_three_to_n( ( 'master', { - 'undercloud_install_release': 'ussuri', + 'undercloud_install_release': 'victoria', 'undercloud_install_hash': 'previous-current-tripleo', 'undercloud_target_release': 'master', 'undercloud_target_hash': 'current-tripleo', @@ -422,6 +460,25 @@ def test_period_ffu_overcloud_upgrade_is_n_minus_three_to_n( }, ), ( + 'victoria', + { + 'undercloud_install_release': 'ussuri', + 'undercloud_install_hash': 'previous-current-tripleo', + 'undercloud_target_release': 'victoria', + 'undercloud_target_hash': 'current-tripleo', + 'overcloud_deploy_release': 'victoria', + 'overcloud_deploy_hash': 'current-tripleo', + 'overcloud_target_release': 'victoria', + 'overcloud_target_hash': 'current-tripleo', + 'standalone_deploy_release': 'victoria', + 'standalone_deploy_newest_hash': 'current', + 'standalone_deploy_hash': 'current-tripleo', + 'standalone_target_release': 'victoria', + 'standalone_target_newest_hash': 'current', + 'standalone_target_hash': 'current-tripleo', + }, + ), + ( 'ussuri', { 'undercloud_install_release': 'train', @@ -530,7 +587,7 @@ def test_undercloud_upgrade_is_n_minus_one_to_n( ( 'master', { - 'undercloud_install_release': 'ussuri', + 'undercloud_install_release': 'victoria', 'undercloud_install_hash': 'previous-current-tripleo', 'undercloud_target_release': 'master', 'undercloud_target_hash': 'current-tripleo', @@ -591,7 +648,7 @@ def test_period_undercloud_upgrade_is_n_minus_one_to_n( 'overcloud_deploy_hash': 'current-tripleo', 'overcloud_target_release': 'master', 'overcloud_target_hash': 'current-tripleo', - 'standalone_deploy_release': 'ussuri', + 'standalone_deploy_release': 'victoria', 'standalone_deploy_newest_hash': 'old-current', 'standalone_deploy_hash': 'previous-current-tripleo', 'standalone_target_release': 'master', @@ -662,7 +719,7 @@ def test_standalone_upgrade_is_n_minus_one_to_n( 'overcloud_deploy_hash': 'current-tripleo', 'overcloud_target_release': 'master', 'overcloud_target_hash': 'current-tripleo', - 'standalone_deploy_release': 'ussuri', + 'standalone_deploy_release': 'victoria', 'standalone_deploy_newest_hash': 'old-current', 'standalone_deploy_hash': 'previous-current-tripleo', 'standalone_target_release': 'master', @@ -671,20 +728,20 @@ def test_standalone_upgrade_is_n_minus_one_to_n( }, ), ( - 'ussuri', + 'victoria', { - 'undercloud_install_release': 'ussuri', + 'undercloud_install_release': 'victoria', 'undercloud_install_hash': 'current-tripleo', - 'undercloud_target_release': 'ussuri', + 'undercloud_target_release': 'victoria', 'undercloud_target_hash': 'current-tripleo', - 'overcloud_deploy_release': 'ussuri', + 'overcloud_deploy_release': 'victoria', 'overcloud_deploy_hash': 'current-tripleo', - 'overcloud_target_release': 'ussuri', + 'overcloud_target_release': 'victoria', 'overcloud_target_hash': 'current-tripleo', - 'standalone_deploy_release': 'train', + 'standalone_deploy_release': 'ussuri', 'standalone_deploy_newest_hash': 'old-current', 'standalone_deploy_hash': 'previous-current-tripleo', - 'standalone_target_release': 'ussuri', + 'standalone_target_release': 'victoria', 'standalone_target_newest_hash': 'current', 'standalone_target_hash': 'current-tripleo', }, @@ -743,6 +800,25 @@ def test_period_standalone_upgrade_is_n_minus_one_to_n( }, ), ( + 'victoria', + { + 'undercloud_install_release': 'victoria', + 'undercloud_install_hash': 'current-tripleo', + 'undercloud_target_release': 'victoria', + 'undercloud_target_hash': 'current-tripleo', + 'overcloud_deploy_release': 'victoria', + 'overcloud_deploy_hash': 'previous-current-tripleo', + 'overcloud_target_release': 'victoria', + 'overcloud_target_hash': 'current-tripleo', + 'standalone_deploy_release': 'victoria', + 'standalone_deploy_newest_hash': 'current', + 'standalone_deploy_hash': 'current-tripleo', + 'standalone_target_release': 'victoria', + 'standalone_target_newest_hash': 'current', + 'standalone_target_hash': 'current-tripleo', + }, + ), + ( 'ussuri', { 'undercloud_install_release': 'ussuri', @@ -870,6 +946,25 @@ def test_overcloud_update_target_is_hash( }, ), ( + 'victoria', + { + 'undercloud_install_release': 'victoria', + 'undercloud_install_hash': 'tripleo-ci-testing', + 'undercloud_target_release': 'victoria', + 'undercloud_target_hash': 'tripleo-ci-testing', + 'overcloud_deploy_release': 'victoria', + 'overcloud_deploy_hash': 'previous-current-tripleo', + 'overcloud_target_release': 'victoria', + 'overcloud_target_hash': 'tripleo-ci-testing', + 'standalone_deploy_release': 'victoria', + 'standalone_deploy_newest_hash': 'current', + 'standalone_deploy_hash': 'tripleo-ci-testing', + 'standalone_target_release': 'victoria', + 'standalone_target_newest_hash': 'current', + 'standalone_target_hash': 'tripleo-ci-testing', + }, + ), + ( 'ussuri', { 'undercloud_install_release': 'ussuri', @@ -998,6 +1093,25 @@ def test_period_overcloud_update_target_is_hash( }, ), ( + 'victoria', + { + 'undercloud_install_release': 'victoria', + 'undercloud_install_hash': 'current-tripleo', + 'undercloud_target_release': 'victoria', + 'undercloud_target_hash': 'current-tripleo', + 'overcloud_deploy_release': 'victoria', + 'overcloud_deploy_hash': 'current-tripleo', + 'overcloud_target_release': 'victoria', + 'overcloud_target_hash': 'current-tripleo', + 'standalone_deploy_release': 'victoria', + 'standalone_deploy_newest_hash': 'current', + 'standalone_deploy_hash': 'current-tripleo', + 'standalone_target_release': 'victoria', + 'standalone_target_newest_hash': 'current', + 'standalone_target_hash': 'current-tripleo', + }, + ), + ( 'ussuri', { 'undercloud_install_release': 'ussuri', @@ -1119,6 +1233,25 @@ def test_noop_target_is_the_same( }, ), ( + 'victoria', + { + 'undercloud_install_release': 'victoria', + 'undercloud_install_hash': 'tripleo-ci-testing', + 'undercloud_target_release': 'victoria', + 'undercloud_target_hash': 'tripleo-ci-testing', + 'overcloud_deploy_release': 'victoria', + 'overcloud_deploy_hash': 'tripleo-ci-testing', + 'overcloud_target_release': 'victoria', + 'overcloud_target_hash': 'tripleo-ci-testing', + 'standalone_deploy_release': 'victoria', + 'standalone_deploy_newest_hash': 'current', + 'standalone_deploy_hash': 'tripleo-ci-testing', + 'standalone_target_release': 'victoria', + 'standalone_target_newest_hash': 'current', + 'standalone_target_hash': 'tripleo-ci-testing', + }, + ), + ( 'ussuri', { 'undercloud_install_release': 'ussuri', diff --git a/scripts/oooq_common_functions.sh b/scripts/oooq_common_functions.sh index 18661f8..7ebb81e 100644 --- a/scripts/oooq_common_functions.sh +++ b/scripts/oooq_common_functions.sh @@ -19,6 +19,9 @@ function previous_release_mixed_upgrade_case { local release="${1:-master}" case "${release}" in ''|master|promotion-testing-hash-master) + echo "victoria" + ;; + victoria|promotion-testing-hash-victoria) echo "ussuri" ;; ussuri|promotion-testing-hash-ussuri)