From 9ec945a0a3a8b494470f9d67930c994ba0ab2048 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 16 Aug 2023 10:25:30 +0100 Subject: [PATCH] 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 --- defaults/main.yml | 4 ++-- .../notes/rename-list-file-path-239294e5a57fef09.yaml | 7 +++++++ tasks/tempest_post_install.yml | 4 ++-- tasks/tempest_run.yml | 8 ++++---- 4 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 releasenotes/notes/rename-list-file-path-239294e5a57fef09.yaml diff --git a/defaults/main.yml b/defaults/main.yml index cfa9a2ac..254c649a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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. diff --git a/releasenotes/notes/rename-list-file-path-239294e5a57fef09.yaml b/releasenotes/notes/rename-list-file-path-239294e5a57fef09.yaml new file mode 100644 index 00000000..76ec906d --- /dev/null +++ b/releasenotes/notes/rename-list-file-path-239294e5a57fef09.yaml @@ -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. diff --git a/tasks/tempest_post_install.yml b/tasks/tempest_post_install.yml index f832a953..ae994e9e 100644 --- a/tasks/tempest_post_install.yml +++ b/tasks/tempest_post_install.yml @@ -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 diff --git a/tasks/tempest_run.yml b/tasks/tempest_run.yml index 493351c0..5c74a5f6 100644 --- a/tasks/tempest_run.yml +++ b/tasks/tempest_run.yml @@ -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: