From cdb438afb0157a7d0d70afd5b3f59fb1d649bc44 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Tue, 7 Jan 2020 17:07:01 +0000 Subject: [PATCH] Re-enable the n-cauth required service for stable/queens|pike|ocata n-cauth serviec has been remvoed from nvoa in Ussuri and that is why it was removed from default services[1]. But that is requried for stable/queens|pike|ocata which still depends on text-matrix for ENABLED_SERVICES. Since stable/rocky we have migrated the service enable in devstack base job[2]. This commit fix the Tempest master and stable/queens|pike|ocata gate by re-enable the n-cauth service for listed stable branches only. Later we can discuss to remove the test-matrix dependency for these branches also. Related-Bug: 1858666 [1] https://review.opendev.org/#/c/700217/ [2] https://review.opendev.org/#/c/546765/ Change-Id: Ia85ea5d338f07cb248f60de44b21826862d09d26 --- roles/test-matrix/files/features.yaml | 6 ++++++ roles/test-matrix/library/test_matrix.py | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/roles/test-matrix/files/features.yaml b/roles/test-matrix/files/features.yaml index c2c4ed74..02e7c8dd 100644 --- a/roles/test-matrix/files/features.yaml +++ b/roles/test-matrix/files/features.yaml @@ -98,6 +98,12 @@ primary: nova: base: services: [n-api, n-cond, n-cpu, n-novnc, n-sch, n-api-meta] + queens: + services: [n-cauth] + pike: + services: [n-cauth] + ocata: + services: [n-cauth] nova-cells: base: diff --git a/roles/test-matrix/library/test_matrix.py b/roles/test-matrix/library/test_matrix.py index 8386facb..95af820b 100755 --- a/roles/test-matrix/library/test_matrix.py +++ b/roles/test-matrix/library/test_matrix.py @@ -84,8 +84,11 @@ def calc_services(branch, features, configs, role): feature, add_services) services.update(add_services) if branch in grid_feature: - services.update( - grid_feature[branch].get('services', [])) + update_services = grid_feature[branch].get('services', []) + if update_services: + LOG.debug('Updating branch: %s specific services for ' + 'feature %s: %s', branch, feature, update_services) + services.update(update_services) # deletes always trump adds for feature in features: