commit 9532986f72a7dbc83bc4246a42bd5cf43c182e74 Author: Arx Cruz Date: Thu Oct 15 15:48:34 2020 +0200 Replace skip_file.j2 template to use tempest-skiplist This template was using the old yaml file, since we still have some jobs running validate-tempest, and the skiplist files were already deprecated, we need to load the testes from the new tempest-skiplist tool. Closes-Bug: #1899980 Change-Id: I954edaf6de84d97dd896b6bbb092931122740b9c diff --git a/roles/validate-tempest/templates/skip_file.j2 b/roles/validate-tempest/templates/skip_file.j2 index a16c814..5531dbe 100644 --- a/roles/validate-tempest/templates/skip_file.j2 +++ b/roles/validate-tempest/templates/skip_file.j2 @@ -1,50 +1,3 @@ -{% if tempest_undercloud and tempest_os_cloud != 'standalone' %} -# skip list for running tempest against the undercloud -{% for skip_test in known_failures %} -{% if (skip_test.undercloud is defined and skip_test.undercloud ) %} - -# {{ skip_test.reason }} -{% if skip_test.bz is defined %} -# {{ skip_test.bz }} -{% endif %} -{% if skip_test.lp is defined %} -# {{ skip_test.lp }} -{% endif %} -{{ skip_test.test }} -{% endif %} +{% for skip_test in tempest_test_blacklist %} +{{ skip_test }} {% endfor %} -{% endif %} - -{% if tempest_undercloud and tempest_os_cloud == 'standalone' %} -# skip list for running tempest against the standalone deployment -{% for skip_test in known_failures %} -{% if (skip_test.undercloud is not defined ) %} - -# {{ skip_test.reason }} -{% if skip_test.bz is defined %} -# {{ skip_test.bz }} -{% endif %} -{% if skip_test.lp is defined %} -# {{ skip_test.lp }} -{% endif %} -{{ skip_test.test }} -{% endif %} -{% endfor %} -{% endif %} - -{% if not tempest_undercloud %} -# skip list for running tempest against the overcloud deployment -{% for skip_test in known_failures %} -{% if (skip_test.undercloud is not defined ) %} - -# {{ skip_test.reason }} -{% if skip_test.bz is defined %} -# {{ skip_test.bz }} -{% endif %} -{% if skip_test.lp is defined %} -# {{ skip_test.lp }} -{% endif %} -{{ skip_test.test }} -{% endif %} -{% endfor %} -{% endif %}