Add global revision to deployment status
Updated basedeployment_data to have version from site-definition.yaml and implemented exception if no global revision existed. Change-Id: I14caf8244a7d36201e9cc4ebc90e310d594743ec
This commit is contained in:
parent
52cb161a71
commit
b5a58659d8
@ -235,14 +235,21 @@ def get_deployment_data_doc(site_name):
|
||||
])), ("data", OrderedDict([("documents", stanzas)]))
|
||||
])
|
||||
try:
|
||||
data = util.definition.load_as_params(site_name)
|
||||
basedeployment_data['data'].update({'site_type': data['site_type']})
|
||||
return basedeployment_data
|
||||
data = util.definition.load(site_name)
|
||||
basedeployment_data['data'].update(
|
||||
{'site_type': data['data']['site_type']})
|
||||
except Exception as ex:
|
||||
LOG.debug(
|
||||
"Unable to get the site definition data for"
|
||||
" site: %s, Exception :%s", site_name, ex)
|
||||
return basedeployment_data
|
||||
try:
|
||||
basedeployment_data['data'].update(
|
||||
{'version': data['data']['repositories']['global']['revision']})
|
||||
except Exception as ex:
|
||||
LOG.debug(
|
||||
"Unable to get the site revision data for global in"
|
||||
" site: %s, Exception :%s", site_name, ex)
|
||||
return basedeployment_data
|
||||
|
||||
|
||||
def _get_repo_deployment_data_stanza(repo_path):
|
||||
|
@ -227,10 +227,13 @@ def test_site_render(create_tmp_site_structure):
|
||||
|
||||
def test_deployment_version_doc(create_tmp_site_structure):
|
||||
"""
|
||||
This test case checks the deployment-version document,
|
||||
test case passes if the site_type parameter exists
|
||||
Testing of deployment-version document generated by collect and render commands.
|
||||
Checks for expected values of resulting document.
|
||||
"""
|
||||
|
||||
version = "v1.0"
|
||||
sitename = "test"
|
||||
rootpath = create_tmp_site_structure(sitename)
|
||||
rendered_doc = site.get_deployment_data_doc(sitename)
|
||||
assert rendered_doc['data']['site_type'] == sitename
|
||||
assert rendered_doc['data']['version'] == version
|
||||
|
Loading…
x
Reference in New Issue
Block a user