openstack
/
devstack-gate
Code Issues Proposed changes

Add more logging to test_matrix.py 

This is just to help with figuring out what's going on in
test_matrix.py when it runs.

Change-Id: I8c81cdc44c62719fea5becfb81f6bab17cbe658e
This commit is contained in:
Matt Riedemann 2019-12-20 15:21:45 -05:00
parent 2cd8f2907f
commit 3e2df9e972
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
roles/test-matrix/library/test_matrix.py
View File

@ -74,10 +74,15 @@ def configs_from_env():
def calc_services(branch, features, role):
LOG.debug('Role: %s', role)
services = set()
for feature in features:
grid_feature = GRID[role][feature]
services.update(grid_feature['base'].get('services', []))
add_services = grid_feature['base'].get('services', [])
if add_services:
LOG.debug('Adding services for feature %s: %s',
feature, add_services)
services.update(add_services)
if branch in grid_feature:
services.update(
grid_feature[branch].get('services', []))
@ -85,12 +90,15 @@ def calc_services(branch, features, role):
# deletes always trump adds
for feature in features:
grid_feature = GRID[role][feature]
services.difference_update(
grid_feature['base'].get('rm-services', []))
rm_services = grid_feature['base'].get('rm-services', [])
if rm_services:
LOG.debug('Removing services for feature %s: %s',
feature, rm_services)
services.difference_update(rm_services)
if branch in grid_feature:
services.difference_update(
grid_feature[branch].get('rm-services', []))
return sorted(list(services))
@ -104,13 +112,20 @@ def calc_features(branch, configs=[]):
# do all the adds first
for config in configs:
if config in GRID['config']:
features.update(GRID['config'][config].get('features', []))
add_features = GRID['config'][config].get('features', [])
if add_features:
LOG.debug('Adding features for config %s: %s',
config, add_features)
features.update(add_features)
# removes always trump
for config in configs:
if config in GRID['config']:
features.difference_update(
GRID['config'][config].get('rm-features', []))
rm_features = GRID['config'][config].get('rm-features', [])
if rm_features:
LOG.debug('Removing features for config %s: %s',
config, rm_features)
features.difference_update(rm_features)
return sorted(list(features))