zuul/zuul-jobs
Code Issues Proposed changes

Fix ansible use of filters and tests

Browse Source 
Ansible 2.9 requires the use of "version" as a filter and
"version_compare" has been removed. Also tests cannot be used as
filters which means we cannot do when: foo | test and must do
when: foo is test instead. Make these fixes.

Both changes should be backward compatible to ansible 2.5:
https://docs.ansible.com/ansible/latest/user_guide/playbooks_tests.html#version-comparison
https://docs.ansible.com/ansible/latest/porting_guides/porting_guide_2.5.html#jinja-tests-used-as-filters

Change-Id: Id95f674a485877db2a7924994366d1c6c591a684
This commit is contained in:
Clark Boylan 2019-12-17 10:46:13 -08:00
parent a554a401ea
commit b62c488eab
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/configure-mirrors/tasks/mirror/Suse.yaml
View File

@ -1,12 +1,12 @@
- name: set zypper base package repository (openSUSE Leap) - name: set zypper base package repository (openSUSE Leap)
set_fact: set_fact:
opensuse_repo_baseurl: "{{ package_mirror }}/distribution/leap/$releasever/repo/oss/" opensuse_repo_baseurl: "{{ package_mirror }}/distribution/leap/$releasever/repo/oss/"
when: not ansible_distribution | search("Tumbleweed") when: ansible_distribution is not search("Tumbleweed")
- name: set zypper base package repository (openSUSE Tumbleweed) - name: set zypper base package repository (openSUSE Tumbleweed)
set_fact: set_fact:
opensuse_repo_baseurl: "{{ package_mirror }}/tumbleweed/repo/oss/" opensuse_repo_baseurl: "{{ package_mirror }}/tumbleweed/repo/oss/"
when: ansible_distribution | search("Tumbleweed") when: ansible_distribution is search("Tumbleweed")
- name: Install Suse repository files - name: Install Suse repository files
become: yes become: yes
@ -31,4 +31,4 @@
src: suse/etc/zypp/repos.d/repo-update.repo.j2 src: suse/etc/zypp/repos.d/repo-update.repo.j2
notify: notify:
- Update zypper cache - Update zypper cache
when: not ansible_distribution | search("Tumbleweed") when: ansible_distribution is not search("Tumbleweed")

6
roles/configure-mirrors/templates/fedora/etc/yum.repos.d/fedora-updates.repo.j2
View File

@ -2,7 +2,7 @@
[updates] [updates]
name=Fedora $releasever - $basearch - Updates name=Fedora $releasever - $basearch - Updates
failovermethod=priority failovermethod=priority
{% if ansible_distribution_version | version_compare('28', '<') %} {% if ansible_distribution_version is version('28', '<') %}
baseurl={{ package_mirror }}/updates/$releasever/$basearch/ baseurl={{ package_mirror }}/updates/$releasever/$basearch/
{% else %} {% else %}
baseurl={{ package_mirror }}/updates/$releasever/Everything/$basearch/ baseurl={{ package_mirror }}/updates/$releasever/Everything/$basearch/
@ -18,7 +18,7 @@ skip_if_unavailable=False
[updates-debuginfo] [updates-debuginfo]
name=Fedora $releasever - $basearch - Updates - Debug name=Fedora $releasever - $basearch - Updates - Debug
failovermethod=priority failovermethod=priority
{% if ansible_distribution_version | version_compare('28', '<') %} {% if ansible_distribution_version is version('28', '<') %}
baseurl={{ package_mirror }}/updates/$releasever/$basearch/debug/ baseurl={{ package_mirror }}/updates/$releasever/$basearch/debug/
{% else %} {% else %}
baseurl={{ package_mirror }}/updates/$releasever/Everything/$basearch/debug/tree/ baseurl={{ package_mirror }}/updates/$releasever/Everything/$basearch/debug/tree/
@ -34,7 +34,7 @@ skip_if_unavailable=False
[updates-source] [updates-source]
name=Fedora $releasever - Updates Source name=Fedora $releasever - Updates Source
failovermethod=priority failovermethod=priority
{% if ansible_distribution_version | version_compare('28', '<') %} {% if ansible_distribution_version is version('28', '<') %}
baseurl={{ package_mirror }}/updates/$releasever/SRPMS/ baseurl={{ package_mirror }}/updates/$releasever/SRPMS/
{% else %} {% else %}
baseurl={{ package_mirror }}/updates/$releasever/Everything/source/tree/ baseurl={{ package_mirror }}/updates/$releasever/Everything/source/tree/