zuul/zuul-jobs
Code Issues Proposed changes

Merge "Avoid to use 'length' filter with null value"

Browse Source
This commit is contained in:
Zuul 2020-08-06 13:36:52 +00:00 committed by Gerrit Code Review
commit 1ba95015ac
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/tox/pre-molecule.yaml
View File

@ -23,4 +23,4 @@
package: package:
name: "{{ tox_molecule_packages }}" name: "{{ tox_molecule_packages }}"
when: when:
- (tox_molecule_packages | length) > 0 - tox_molecule_packages | default(false)

8
roles/ensure-docker/tasks/main.yaml
View File

@ -24,7 +24,7 @@
being gathered prior to executing this role. being gathered prior to executing this role.
when: when:
- not (docker_distro_vars_loaded | bool) - not (docker_distro_vars_loaded | bool)
- (docker_distro_packages | length) < 1 - not docker_distro_packages
- name: Sanity check for distro install - name: Sanity check for distro install
fail: fail:
@ -34,7 +34,7 @@
required. Please check your settings. required. Please check your settings.
docker_distro_packages = {{ docker_distro_packages }} docker_distro_packages = {{ docker_distro_packages }}
when: when:
- (docker_distro_packages | length) < 1 - not docker_distro_packages
- not (use_upstream_docker | bool) - not (use_upstream_docker | bool)
- name: Sanity check for upstream install - name: Sanity check for upstream install
@ -45,7 +45,7 @@
required. Please check your settings. required. Please check your settings.
docker_upstream_distro_packages = {{ docker_upstream_distro_packages }} docker_upstream_distro_packages = {{ docker_upstream_distro_packages }}
when: when:
- (docker_upstream_distro_packages | length) < 1 - not docker_upstream_distro_packages
- use_upstream_docker | bool - use_upstream_docker | bool
- name: Sanity check for upstream install mirrors - name: Sanity check for upstream install mirrors
@ -54,7 +54,7 @@
The variable `docker_mirror_base_url` is null, and upstream installation has been enabled. The variable `docker_mirror_base_url` is null, and upstream installation has been enabled.
Check your settings. Check your settings.
when: when:
- (docker_mirror_base_url | length) < 1 - not docker_mirror_base_url
- use_upstream_docker | bool - use_upstream_docker | bool
- include_tasks: "docker-{{ (use_upstream_docker | bool) | ternary('upstream', 'distro') }}.yaml" - include_tasks: "docker-{{ (use_upstream_docker | bool) | ternary('upstream', 'distro') }}.yaml"