zuul/zuul-jobs
Code Issues Proposed changes

test-playbooks: improved syntax

Browse Source 
- added space around jinja variables
- use "name" argument on include_role, instead of undocumented role

Change-Id: I0984ca391667ace24705b20dd60eddd90e3a281e
This commit is contained in:
Sorin Sbarnea 2020-05-28 19:11:28 +01:00
parent 40e6f47ac1
commit b5408ca3fc
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test-playbooks/ansible-lint-rules/run.yaml
View File

@ -9,7 +9,7 @@
- name: Install linters-requirements.txt - name: Install linters-requirements.txt
pip: pip:
requirements: "{{ansible_user_dir}}/{{ zuul.project.src_dir }}/linters-requirements.txt" requirements: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/linters-requirements.txt"
virtualenv: "{{ ansible_lint_tempdir.path }}" virtualenv: "{{ ansible_lint_tempdir.path }}"
- name: Make sure ansible-lint is installed - name: Make sure ansible-lint is installed
@ -22,7 +22,7 @@
-maxdepth 4 -maxdepth 4
-wholename '*ZUULJOBS*/faulty/*/*' -wholename '*ZUULJOBS*/faulty/*/*'
args: args:
chdir: "{{ ansible_user_dir}}/{{ zuul.project.src_dir }}" chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
register: faulty_ansible_items register: faulty_ansible_items
- name: Get valid playbooks and roles - name: Get valid playbooks and roles
@ -32,7 +32,7 @@
-maxdepth 4 -maxdepth 4
-wholename '*ZUULJOBS*/valid/roles/*' -wholename '*ZUULJOBS*/valid/roles/*'
args: args:
chdir: "{{ ansible_user_dir}}/{{ zuul.project.src_dir }}" chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
register: valid_ansible_items register: valid_ansible_items
- name: Make sure faulty roles fail linting - name: Make sure faulty roles fail linting
@ -52,7 +52,7 @@
-t {{ item | regex_replace('.*/(ZUULJOBS.*?)/.*', '\1') }} -t {{ item | regex_replace('.*/(ZUULJOBS.*?)/.*', '\1') }}
{{ item }} {{ item }}
args: args:
chdir: "{{ansible_user_dir}}/{{ zuul.project.src_dir }}" chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
register: ansible_lint register: ansible_lint
failed_when: ansible_lint.rc != 0 failed_when: ansible_lint.rc != 0
loop: "{{ valid_ansible_items.stdout_lines }}" loop: "{{ valid_ansible_items.stdout_lines }}"

2
test-playbooks/ensure-tox.yaml
View File

@ -49,5 +49,5 @@
- name: Verify tox_executable is set to the virtualenv tox - name: Verify tox_executable is set to the virtualenv tox
assert: assert:
that: that:
- tox_executable == '{{ ansible_user_dir}}/tox-venv/bin/tox' - tox_executable == '{{ ansible_user_dir }}/tox-venv/bin/tox'

2
test-playbooks/registry/buildset-registry.yaml
View File

@ -9,7 +9,7 @@
# run use-buildset-registry. # run use-buildset-registry.
- name: Run the fake buildset registry - name: Run the fake buildset registry
include_role: include_role:
role: run-buildset-registry name: run-buildset-registry
vars: vars:
buildset_registry_root: "{{ ansible_user_dir }}/fake_buildset_registry" buildset_registry_root: "{{ ansible_user_dir }}/fake_buildset_registry"
buildset_registry_port: 9000 buildset_registry_port: 9000