From f16bbeeaf2daea8a9210930cf5bba013194dedde Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Thu, 16 Aug 2018 15:52:16 +0300 Subject: [PATCH] Add rocky to emit files Until the rocky repos are in place and working adjust deployment to not install rocky in undercloud/overcloud. Follow up patch required once rocky is promoted to start installing rocky. Change-Id: I3f714203803ddcbf72aa203c11ebbc68ad3c8def --- scripts/emit_releases_file/emit_releases_file.py | 6 +++++- scripts/emit_releases_file/test_release_name.py | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/emit_releases_file/emit_releases_file.py b/scripts/emit_releases_file/emit_releases_file.py index 64783bd7d..e6e635548 100644 --- a/scripts/emit_releases_file/emit_releases_file.py +++ b/scripts/emit_releases_file/emit_releases_file.py @@ -7,7 +7,7 @@ import requests import yaml # Define releases -RELEASES = ['newton', 'ocata', 'pike', 'queens', 'master'] +RELEASES = ['newton', 'ocata', 'pike', 'queens', 'rocky', 'master'] # Define long term releases LONG_TERM_SUPPORT_RELEASES = ['queens'] @@ -136,6 +136,8 @@ 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: @@ -156,6 +158,8 @@ 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 67e025f0b..8df26f9ef 100644 --- a/scripts/emit_releases_file/test_release_name.py +++ b/scripts/emit_releases_file/test_release_name.py @@ -15,6 +15,15 @@ import pytest 'overcloud_deploy_hash': 'old-current-tripleo', 'overcloud_target_release': 'master', 'overcloud_target_hash': 'current-tripleo', + }), ('rocky', { + 'undercloud_install_release': 'rocky', + 'undercloud_install_hash': 'current-tripleo', + 'undercloud_target_release': 'rocky', + 'undercloud_target_hash': 'current-tripleo', + 'overcloud_deploy_release': 'queens', + 'overcloud_deploy_hash': 'old-current-tripleo', + 'overcloud_target_release': 'rocky', + 'overcloud_target_hash': 'current-tripleo', }), ('queens', { 'undercloud_install_release': 'queens', 'undercloud_install_hash': 'current-tripleo',