From 4891218efa8eb216cf5590bda07fa20304290628 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Thu, 8 Nov 2018 15:04:32 -0800 Subject: [PATCH] Ignore list_all_implied_roles on Ubuntu distro installs The Ubuntu tempest distro package's 'list_all_implied_roles' test does not take into account the new default 'admin', 'member', and 'reader' roles. Unfortunately, it also expects 'whitelist-file' and 'blacklist-file' to be mutually exclusive options. Use a negative lookahead to ignore the 'list_all_implied_roles' test when running tempest installed with the Ubuntu distro package. python-junitxml is added to the tempest_service_distro_packages to generate xml subunit results. Change-Id: Idf1b4705cd61e0e31a4f3c0b8f8588f1a43ce4b6 --- defaults/main.yml | 3 ++- vars/ubuntu.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index dcfbf148..4a65fd40 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -94,7 +94,8 @@ tempest_test_blacklist_file_path: "{{ tempest_workspace }}/etc/tempest_blacklist # This sets up a list of tests to execute based on what's deployed in the environment. # The list gets added to the whitelist which tempest executes. tempest_test_whitelist: - - "tempest.api.identity.admin.v3" + - "{{ (ansible_pkg_mgr == 'apt' and tempest_install_method == 'distro') | + ternary('(?!.*\\.test_list_all_implied_roles)', '') ~ 'tempest.api.identity.admin.v3' }}" - "tempest.api.identity.v3" - "{{ (tempest_service_available_ceilometer | bool) | ternary('tempest.api.telemetry', '') }}" - "{{ (tempest_service_available_heat | bool) | ternary('tempest.api.orchestration.stacks.test_non_empty_stack', '') }}" diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml index a2ff744e..92895001 100644 --- a/vars/ubuntu.yml +++ b/vars/ubuntu.yml @@ -23,4 +23,5 @@ tempest_distro_packages: tempest_service_distro_packages: - tempest + - python-junitxml - python-subunit