openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Add wallaby support for emit_releases_file.py"

This commit is contained in:
Zuul 2021-04-07 11:26:29 +00:00 committed by Gerrit Code Review
parent 21fe9c416d f14bb680fb
commit 8055430854
4 changed files with 153 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/run-test/templates/oooq_common_functions.sh.j2
View File

@ -19,6 +19,9 @@ function previous_release_mixed_upgrade_case {
local release="${1:-master}"
case "${release}" in
''|master|promotion-testing-hash-master)
echo "wallaby"
;;
wallaby|promotion-testing-hash-wallaby)
echo "victoria"
;;
victoria|promotion-testing-hash-victoria)

1
scripts/emit_releases_file/emit_releases_file.py
View File

@ -48,6 +48,7 @@ RELEASES = [
'train',
'ussuri',
'victoria',
'wallaby',
'master',
]
# Define long term releases

159
scripts/emit_releases_file/test_release_name.py
View File

@ -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': 'victoria',
'overcloud_deploy_release': 'wallaby',
'overcloud_deploy_hash': 'previous-current-tripleo',
'overcloud_target_release': 'master',
'overcloud_target_hash': 'current-tripleo',
@ -52,6 +52,25 @@ def hash_mock_setup():
'standalone_target_hash': 'current-tripleo',
},
),
(
'wallaby',
{
'undercloud_install_release': 'wallaby',
'undercloud_install_hash': 'current-tripleo',
'undercloud_target_release': 'wallaby',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'victoria',
'overcloud_deploy_hash': 'previous-current-tripleo',
'overcloud_target_release': 'wallaby',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'wallaby',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'wallaby',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
},
),
(
'victoria',
{
@ -149,7 +168,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': 'victoria',
'overcloud_deploy_release': 'wallaby',
'overcloud_deploy_hash': 'previous-current-tripleo',
'overcloud_target_release': 'master',
'overcloud_target_hash': 'current-tripleo',
@ -161,6 +180,25 @@ def test_overcloud_upgrade_is_n_minus_one_to_n(
'standalone_target_hash': 'current-tripleo',
},
),
(
'wallaby',
{
'undercloud_install_release': 'wallaby',
'undercloud_install_hash': 'current-tripleo',
'undercloud_target_release': 'wallaby',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'victoria',
'overcloud_deploy_hash': 'previous-current-tripleo',
'overcloud_target_release': 'wallaby',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'wallaby',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'wallaby',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
},
),
(
'victoria',
{
@ -367,7 +405,7 @@ def test_period_ffu_overcloud_upgrade_is_n_minus_three_to_n(
(
'master',
{
'undercloud_install_release': 'victoria',
'undercloud_install_release': 'wallaby',
'undercloud_install_hash': 'previous-current-tripleo',
'undercloud_target_release': 'master',
'undercloud_target_hash': 'current-tripleo',
@ -383,6 +421,25 @@ def test_period_ffu_overcloud_upgrade_is_n_minus_three_to_n(
'standalone_target_hash': 'current-tripleo',
},
),
(
'wallaby',
{
'undercloud_install_release': 'victoria',
'undercloud_install_hash': 'previous-current-tripleo',
'undercloud_target_release': 'wallaby',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'wallaby',
'overcloud_deploy_hash': 'current-tripleo',
'overcloud_target_release': 'wallaby',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'wallaby',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'wallaby',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
},
),
(
'victoria',
{
@ -473,7 +530,7 @@ def test_undercloud_upgrade_is_n_minus_one_to_n(
(
'master',
{
'undercloud_install_release': 'victoria',
'undercloud_install_release': 'wallaby',
'undercloud_install_hash': 'previous-current-tripleo',
'undercloud_target_release': 'master',
'undercloud_target_hash': 'current-tripleo',
@ -553,7 +610,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': 'victoria',
'standalone_deploy_release': 'wallaby',
'standalone_deploy_newest_hash': 'old-current',
'standalone_deploy_hash': 'previous-current-tripleo',
'standalone_target_release': 'master',
@ -605,7 +662,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': 'victoria',
'standalone_deploy_release': 'wallaby',
'standalone_deploy_newest_hash': 'old-current',
'standalone_deploy_hash': 'previous-current-tripleo',
'standalone_target_release': 'master',
@ -614,20 +671,20 @@ def test_standalone_upgrade_is_n_minus_one_to_n(
},
),
(
'victoria',
'wallaby',
{
'undercloud_install_release': 'victoria',
'undercloud_install_release': 'wallaby',
'undercloud_install_hash': 'current-tripleo',
'undercloud_target_release': 'victoria',
'undercloud_target_release': 'wallaby',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'victoria',
'overcloud_deploy_release': 'wallaby',
'overcloud_deploy_hash': 'current-tripleo',
'overcloud_target_release': 'victoria',
'overcloud_target_release': 'wallaby',
'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': 'victoria',
'standalone_target_release': 'wallaby',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
},
@ -685,6 +742,25 @@ def test_period_standalone_upgrade_is_n_minus_one_to_n(
'standalone_target_release': 'master',
},
),
(
'wallaby',
{
'undercloud_install_release': 'wallaby',
'undercloud_install_hash': 'current-tripleo',
'undercloud_target_release': 'wallaby',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'wallaby',
'overcloud_deploy_hash': 'previous-current-tripleo',
'overcloud_target_release': 'wallaby',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'wallaby',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'wallaby',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
},
),
(
'victoria',
{
@ -812,6 +888,25 @@ def test_overcloud_update_target_is_hash(
'standalone_target_release': 'master',
},
),
(
'wallaby',
{
'undercloud_install_release': 'wallaby',
'undercloud_install_hash': 'tripleo-ci-testing',
'undercloud_target_release': 'wallaby',
'undercloud_target_hash': 'tripleo-ci-testing',
'overcloud_deploy_release': 'wallaby',
'overcloud_deploy_hash': 'previous-current-tripleo',
'overcloud_target_release': 'wallaby',
'overcloud_target_hash': 'tripleo-ci-testing',
'standalone_deploy_release': 'wallaby',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'tripleo-ci-testing',
'standalone_target_release': 'wallaby',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'tripleo-ci-testing',
},
),
(
'victoria',
{
@ -921,6 +1016,25 @@ def test_period_overcloud_update_target_is_hash(
'standalone_target_release': 'master',
},
),
(
'wallaby',
{
'undercloud_install_release': 'wallaby',
'undercloud_install_hash': 'current-tripleo',
'undercloud_target_release': 'wallaby',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'wallaby',
'overcloud_deploy_hash': 'current-tripleo',
'overcloud_target_release': 'wallaby',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'wallaby',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'wallaby',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
},
),
(
'victoria',
{
@ -1041,6 +1155,25 @@ def test_noop_target_is_the_same(
'standalone_target_release': 'master',
},
),
(
'wallaby',
{
'undercloud_install_release': 'wallaby',
'undercloud_install_hash': 'tripleo-ci-testing',
'undercloud_target_release': 'wallaby',
'undercloud_target_hash': 'tripleo-ci-testing',
'overcloud_deploy_release': 'wallaby',
'overcloud_deploy_hash': 'tripleo-ci-testing',
'overcloud_target_release': 'wallaby',
'overcloud_target_hash': 'tripleo-ci-testing',
'standalone_deploy_release': 'wallaby',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'tripleo-ci-testing',
'standalone_target_release': 'wallaby',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'tripleo-ci-testing',
},
),
(
'victoria',
{

3
scripts/oooq_common_functions.sh
View File

@ -19,6 +19,9 @@ function previous_release_mixed_upgrade_case {
local release="${1:-master}"
case "${release}" in
''|master|promotion-testing-hash-master)
echo "wallaby"
;;
wallaby|promotion-testing-hash-wallaby)
echo "victoria"
;;
victoria|promotion-testing-hash-victoria)