Support non-zuul workflow for list_skipped_yaml_file

Currently, the step to install the tempest-skiplist
fails on non-zuul platforms.
This review allows the test to source the skiplist
file from the local workspace if needed.

Change-Id: I792c32259378a779fab5455cf6c274fb0fe9756f
Closes-Bug: #1888244
This commit is contained in:
Ronelle Landy 2020-07-20 11:57:26 -04:00 committed by Arx Cruz
parent 71b0a0415e
commit bca408e823
5 changed files with 9 additions and 5 deletions

View File

@ -3,5 +3,3 @@
roles:
- ensure-pip
- install_skiplist
vars:
tempest_skip_path: "{{ zuul.projects['opendev.org/openstack/openstack-tempest-skiplist'].src_dir }}"

View File

@ -3,6 +3,3 @@
roles:
- validate_yaml
- list_skipped
vars:
tempest_skip_path: "{{ zuul.projects['opendev.org/openstack/openstack-tempest-skiplist'].src_dir }}"
list_skipped_yaml_file: "{{ tempest_skip_path }}/roles/validate-tempest/vars/tempest_skip.yml"

View File

@ -1,3 +1,7 @@
---
# Path for the tempest skip
# tempest_skip_path:
_zuul_path: "{{ zuul.projects['opendev.org/openstack/openstack-tempest-skiplist'].src_dir | default('') }}"
_local_path: "{{ local_working_directory | default('') }}/usr/local/share/ansible"
tempest_skip_path: "{{ (zuul is defined) | ternary(_zuul_path, _local_path) }}"
list_skipped_yaml_file: "{{ tempest_skip_path }}/roles/validate-tempest/vars/tempest_skip.yml"

View File

@ -2,3 +2,7 @@
# list_skipped_yaml_file: /home/zuul/src/openstack/openstack-tempest-skiplist/roles/validate-tempest/vars/tempest_skip.yml
# list_skipped_job: tripleo-ci-centos-8-containers-multinode
# list_skipped_release: master
_zuul_path: "{{ zuul.projects['opendev.org/openstack/openstack-tempest-skiplist'].src_dir | default('') }}"
_local_path: "{{ local_working_directory | default('') }}/usr/local/share/ansible"
tempest_skip_path: "{{ (zuul is defined) | ternary(_zuul_path, _local_path) }}"
list_skipped_yaml_file: "{{ tempest_skip_path }}/roles/validate-tempest/vars/tempest_skip.yml"

View File

@ -23,6 +23,7 @@ data_files =
usr/local/share/ansible/roles/install_skiplist = roles/install_skiplist/*
usr/local/share/ansible/roles/validate_yaml = roles/validate_yaml/*
usr/local/share/ansible/roles/list_skipped = roles/list_skipped/*
usr/local/share/ansible/roles/validate-tempest = roles/validate-tempest/*
[entry_points]
console_scripts =