openstack/openstack-ansible-tests
Code Issues Proposed changes

Merge "Test repos with the ansible-role prefix in openstack-ci"

Browse Source
This commit is contained in:
Zuul 2018-04-30 05:07:07 +00:00 committed by Gerrit Code Review
commit 3f0d1a75bf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
get-ansible-role-requirements.yml
View File

@ -91,7 +91,7 @@
zuul_src_repo_list: > zuul_src_repo_list: >
{%- set filtered_repo_list = [] %} {%- set filtered_repo_list = [] %}
{%- for folder_path in zuul_src_folder['stdout_lines'] %} {%- for folder_path in zuul_src_folder['stdout_lines'] %}
{%- if folder_path | match("^" ~ zuul_git_src_dir ~ "/openstack/openstack-ansible-(?!tests).*") %} {%- if folder_path | match("^" ~ zuul_git_src_dir ~ "/openstack/(openstack-ansible-|ansible-role-){1}(?!tests).*") %}
{%- set repo_cleaned = folder_path | regex_replace('^' ~ zuul_git_src_dir ~ '/', '') %} {%- set repo_cleaned = folder_path | regex_replace('^' ~ zuul_git_src_dir ~ '/', '') %}
{%- set _ = filtered_repo_list.append(repo_cleaned) %} {%- set _ = filtered_repo_list.append(repo_cleaned) %}
{%- endif %} {%- endif %}
@ -114,7 +114,7 @@
- name: Link the zuul provided roles - name: Link the zuul provided roles
file: file:
src: "{{ zuul_git_src_dir }}/{{ item }}" src: "{{ zuul_git_src_dir }}/{{ item }}"
dest: "{{ lookup('env', 'ANSIBLE_ROLE_DEP_DIR') }}/{{ item | regex_replace('openstack/openstack-ansible-', '') }}" dest: "{{ lookup('env', 'ANSIBLE_ROLE_DEP_DIR') }}/{{ item | regex_replace('openstack/(openstack-ansible-|ansible-role-)', '') }}"
state: link state: link
force: yes force: yes
with_items: "{{ zuul_src_repo_list }}" with_items: "{{ zuul_src_repo_list }}"