openstack
/
tripleo-ci
Code Issues Proposed changes

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
This commit is contained in:
Sagi Shnaidman 2018-08-16 15:52:16 +03:00 committed by yatin
parent 198dd65043
commit f16bbeeaf2
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/emit_releases_file/emit_releases_file.py
View File

@ -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

9
scripts/emit_releases_file/test_release_name.py
View File

@ -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',