From 17130a21504c1484ef9c2780e637d10ea12356ae Mon Sep 17 00:00:00 2001 From: Pooja Jadhav Date: Thu, 6 Oct 2022 21:21:55 +0530 Subject: [PATCH] Add zed release to emit_release code This patch adds zed release to emit_release code baecasue it is blocking while adding periodic zed minor update job [1] with error logs [2]. [1] https://review.rdoproject.org/r/c/rdo-jobs/+/45292/3/zuul.d/integration-jobs-cs9-zed.yaml [2] https://logserver.rdoproject.org/97/40897/7/check/periodic-tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates-zed/eeede57/job-output.txt Change-Id: If1d45e7e0a882b4645253d6e8c1887af918f9a58 --- .../emit_releases_file/emit_releases_file.py | 1 + .../emit_releases_file/test_release_name.py | 69 +++++++++++++++++-- 2 files changed, 64 insertions(+), 6 deletions(-) diff --git a/scripts/emit_releases_file/emit_releases_file.py b/scripts/emit_releases_file/emit_releases_file.py index 9f21fc6d2..d297b0404 100644 --- a/scripts/emit_releases_file/emit_releases_file.py +++ b/scripts/emit_releases_file/emit_releases_file.py @@ -38,6 +38,7 @@ RELEASES = [ 'ussuri', 'victoria', 'wallaby', + 'zed', '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 2948fd81d..45868c9c9 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': 'wallaby', + 'overcloud_deploy_release': 'zed', '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', }, ), + ( + 'zed', + { + 'undercloud_install_release': 'zed', + 'undercloud_install_hash': 'current-tripleo', + 'undercloud_target_release': 'zed', + 'undercloud_target_hash': 'current-tripleo', + 'overcloud_deploy_release': 'wallaby', + 'overcloud_deploy_hash': 'previous-current-tripleo', + 'overcloud_target_release': 'zed', + 'overcloud_target_hash': 'current-tripleo', + 'standalone_deploy_release': 'zed', + 'standalone_deploy_newest_hash': 'current', + 'standalone_deploy_hash': 'current-tripleo', + 'standalone_target_release': 'zed', + 'standalone_target_newest_hash': 'current', + 'standalone_target_hash': 'current-tripleo', + }, + ), ( 'wallaby', { @@ -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': 'wallaby', + 'overcloud_deploy_release': 'zed', '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', }, ), + ( + 'zed', + { + 'undercloud_install_release': 'zed', + 'undercloud_install_hash': 'current-tripleo', + 'undercloud_target_release': 'zed', + 'undercloud_target_hash': 'current-tripleo', + 'overcloud_deploy_release': 'wallaby', + 'overcloud_deploy_hash': 'previous-current-tripleo', + 'overcloud_target_release': 'zed', + 'overcloud_target_hash': 'current-tripleo', + 'standalone_deploy_release': 'zed', + 'standalone_deploy_newest_hash': 'current', + 'standalone_deploy_hash': 'current-tripleo', + 'standalone_target_release': 'zed', + 'standalone_target_newest_hash': 'current', + 'standalone_target_hash': 'current-tripleo', + }, + ), ( 'wallaby', { @@ -256,7 +294,7 @@ def test_period_overcloud_upgrade_is_n_minus_one_to_n( ( 'master', { - 'undercloud_install_release': 'wallaby', + 'undercloud_install_release': 'zed', 'undercloud_install_hash': 'previous-current-tripleo', 'undercloud_target_release': 'master', 'undercloud_target_hash': 'current-tripleo', @@ -272,6 +310,25 @@ def test_period_overcloud_upgrade_is_n_minus_one_to_n( 'standalone_target_hash': 'current-tripleo', }, ), + ( + 'zed', + { + 'undercloud_install_release': 'wallaby', + 'undercloud_install_hash': 'previous-current-tripleo', + 'undercloud_target_release': 'zed', + 'undercloud_target_hash': 'current-tripleo', + 'overcloud_deploy_release': 'zed', + 'overcloud_deploy_hash': 'current-tripleo', + 'overcloud_target_release': 'zed', + 'overcloud_target_hash': 'current-tripleo', + 'standalone_deploy_release': 'zed', + 'standalone_deploy_newest_hash': 'current', + 'standalone_deploy_hash': 'current-tripleo', + 'standalone_target_release': 'zed', + 'standalone_target_newest_hash': 'current', + 'standalone_target_hash': 'current-tripleo', + }, + ), ( 'wallaby', { @@ -362,7 +419,7 @@ def test_undercloud_upgrade_is_n_minus_one_to_n( ( 'master', { - 'undercloud_install_release': 'wallaby', + 'undercloud_install_release': 'zed', 'undercloud_install_hash': 'previous-current-tripleo', 'undercloud_target_release': 'master', 'undercloud_target_hash': 'current-tripleo', @@ -442,7 +499,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': 'wallaby', + 'standalone_deploy_release': 'zed', 'standalone_deploy_newest_hash': 'old-current', 'standalone_deploy_hash': 'previous-current-tripleo', 'standalone_target_release': 'master', @@ -494,7 +551,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': 'wallaby', + 'standalone_deploy_release': 'zed', 'standalone_deploy_newest_hash': 'old-current', 'standalone_deploy_hash': 'previous-current-tripleo', 'standalone_target_release': 'master',