cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Installroot OS version check fix (#20180)

Browse source 
Cast to int before checking the OS version.
This prevents the DNF tests from running on
Fedora < 23
This commit is contained in:
berenddeschouwer 2017-01-13 04:02:35 +02:00 committed by Matt Davis
parent 4b3977d5af
commit b1c57ea443
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/integration/targets/dnf/tasks/main.yml
View file

@ -20,7 +20,7 @@
# We want to test that for people who don't want to upgrade their systems.
- include: 'dnf.yml'
when: (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and False) or (ansible_distribution in ['Fedora'] and ansible_distribution_major_version >= 23)
when: (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and False) or (ansible_distribution in ['Fedora'] and ansible_distribution_major_version|int >= 23)
- include: 'dnfinstallroot.yml'
when: (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and False) or (ansible_distribution in ['Fedora'] and ansible_distribution_major_version >= 23)
when: (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and False) or (ansible_distribution in ['Fedora'] and ansible_distribution_major_version|int >= 23)

2
test/integration/targets/yum/tasks/main.yml
View file

@ -28,5 +28,5 @@
# It will always run with $releasever unset
- include: 'yuminstallroot.yml'
when: (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] or
(ansible_distribution in ['Fedora'] and ansible_distribution_major_version < 23)) and
(ansible_distribution in ['Fedora'] and ansible_distribution_major_version|int < 23)) and
ansible_python.version.major == 2