tempest: Rework regex to a list

Change-Id: I7505f8feeb85f606df92a20bf4a4700d5ea36a51
Signed-off-by: Michal Nasiadka <[email protected]>

Author: mnasiadka

roles/kolla-ansible-tempest/defaults/main.yml

@@ -5,9 +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

roles/kolla-ansible-tempest/tasks/main.yml

@@ -43,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

zuul.d/base.yaml

@@ -63,7 +63,8 @@
       container_engine: "docker"
       is_upgrade: "{{ 'upgrade' in zuul.job }}"
       is_slurp: "{{ 'slurp' in zuul.job }}"
-      kolla_ansible_tempest_regex: "\\[.*\\bsmoke\\b.*\\]"
+      kolla_ansible_tempest_regex:
+        - .*smoke.*
       kolla_internal_vip_address: "192.0.2.10"
       le_enabled: false
       neutron_external_bridge_name: br-0

zuul.d/scenarios/cephadm.yaml

@@ -12,7 +12,8 @@
       kolla_ansible_setup_disks_file_path: "/var/lib/ceph-osd.img"
       kolla_ansible_setup_disks_vg_name: "cephvg"
       kolla_ansible_setup_disks_lv_name: "cephlv"
-      kolla_ansible_tempest_exclude_regex: "^tempest.api.object_storage"
+      kolla_ansible_tempest_exclude_regex:
+        - ^tempest.api.object_storage
       scenario: cephadm
       scenario_images_extra:
         - ^cinder