diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/kolla-ansible-tempest/defaults/main.yml | 5 | ||||
| -rw-r--r-- | roles/kolla-ansible-tempest/tasks/main.yml | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/roles/kolla-ansible-tempest/defaults/main.yml b/roles/kolla-ansible-tempest/defaults/main.yml index 1c296e926..052afeb61 100644 --- a/roles/kolla-ansible-tempest/defaults/main.yml +++ b/roles/kolla-ansible-tempest/defaults/main.yml @@ -5,8 +5,9 @@ kolla_ansible_tempest_packages: kolla_ansible_tempest_build_timeout: 900 kolla_ansible_tempest_cirros_ver: "0.6.3" -kolla_ansible_tempest_exclude_regex: "" +kolla_ansible_tempest_exclude_regex: [] kolla_ansible_tempest_packages_extra: [] -kolla_ansible_tempest_regex: "" +kolla_ansible_tempest_regex: [] +kolla_ansible_tempest_upper_constraints: "{{ ansible_env.HOME }}/src/opendev.org/openstack/requirements/upper-constraints.txt" post_upgrade: false diff --git a/roles/kolla-ansible-tempest/tasks/main.yml b/roles/kolla-ansible-tempest/tasks/main.yml index 4fdb8571c..5476b1183 100644 --- a/roles/kolla-ansible-tempest/tasks/main.yml +++ b/roles/kolla-ansible-tempest/tasks/main.yml @@ -2,6 +2,7 @@ - name: Install required packages ansible.builtin.pip: name: "{{ kolla_ansible_tempest_packages + kolla_ansible_tempest_packages_extra }}" + extra_args: "{{ ('-c' + kolla_ansible_tempest_upper_constraints) if kolla_ansible_tempest_upper_constraints | length > 0 }}" virtualenv: "{{ kolla_ansible_venv_path }}" virtualenv_command: "python3 -m venv" @@ -42,9 +43,9 @@ {{ kolla_ansible_venv_path }}/bin/tempest run --config-file etc/tempest.conf {% if kolla_ansible_tempest_regex | length > 0 %} - --regex '{{ kolla_ansible_tempest_regex }}' + --regex '{{ kolla_ansible_tempest_regex | join("|") }}' {% endif %} {% if kolla_ansible_tempest_exclude_regex | length > 0 %} - --exclude-regex '{{ kolla_ansible_tempest_exclude_regex }}' + --exclude-regex '{{ kolla_ansible_tempest_exclude_regex | join("|") }}' {% endif %} >/tmp/logs/ansible/{{ tempest_log_file }} 2>&1 |