Rename includelist/excludelist file path vars

These variable names collide with the best name prefix to use when
gathering many variable names into a combined include/exclude list.

Codesearch shows no use of these as overrides and the number of
cases when an override would be needed is small.

Change-Id: Ic64165e41d24ae8dc75061589de84fa57998f03d
This commit is contained in:
Jonathan Rosser 2023-08-16 10:25:30 +01:00
parent 47deba8c31
commit 9ec945a0a3
4 changed files with 15 additions and 8 deletions

View File

@ -165,8 +165,8 @@ tempest_plugin_zun_git_install_branch: master
tempest_workspace: "{{ ansible_facts['env']['HOME'] }}/workspace"
# The location where the test include/exclude lists will be placed
tempest_test_includelist_file_path: "{{ tempest_workspace }}/etc/tempest_includelist.txt"
tempest_test_excludelist_file_path: "{{ tempest_workspace }}/etc/tempest_excludelist.txt"
tempest_includelist_file_path: "{{ tempest_workspace }}/etc/tempest_includelist.txt"
tempest_excludelist_file_path: "{{ tempest_workspace }}/etc/tempest_excludelist.txt"
# Tests to execute:
# This sets up a list of tests to execute based on what's deployed in the environment.

View File

@ -0,0 +1,7 @@
---
upgrade:
- |
The variables `tempest_test_includelist_file_path` and `tempest_test_excludelist_file_path`
are renamed to `tempest_includelist_file_path` and `tempest_excludelist_file_path`.
Any overrides using these variables should be updated to account for the
new variable names.

View File

@ -163,7 +163,7 @@
{{ item }}
{% endif %}
{% endfor %}
dest: "{{ tempest_test_includelist_file_path }}"
dest: "{{ tempest_includelist_file_path }}"
mode: "0644"
when:
- tempest_test_includelist | length > 0
@ -180,7 +180,7 @@
{{ item }}
{% endif %}
{% endfor %}
dest: "{{ tempest_test_excludelist_file_path }}"
dest: "{{ tempest_excludelist_file_path }}"
mode: "0644"
when:
- tempest_test_excludelist | length > 0

View File

@ -32,9 +32,9 @@
--worker-file {{ tempest_test_worker_file_path }} \
{% endif %}
{% if tempest_test_excludelist | length > 0 %}
--exclude-list {{ tempest_test_excludelist_file_path }} \
--exclude-list {{ tempest_excludelist_file_path }} \
{% endif %}
--include-list {{ tempest_test_includelist_file_path }} > {{ tempest_log_dir }}/tempest_run.log
--include-list {{ tempest_includelist_file_path }} > {{ tempest_log_dir }}/tempest_run.log
args:
chdir: "{{ tempest_workspace }}"
executable: /bin/bash
@ -109,9 +109,9 @@
. {{ tempest_venv_bin }}/activate
fi
tempest run \
--include-list {{ tempest_test_includelist_file_path }} \
--include-list {{ tempest_includelist_file_path }} \
{% if tempest_test_excludelist | length > 0 %}
--exclude-list {{ tempest_test_excludelist_file_path }} \
--exclude-list {{ tempest_excludelist_file_path }} \
{% endif %}
--list-tests &> {{ tempest_log_dir }}/test_list.txt
args: