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

Fix yum test case on ppc64le

Browse source 
This patch covers a few changes to get the yum test case working on ppc64le
CentOS.  Specifically we needed to enable the EPEL repository on CentOS
as well as ensure some of the architecture-specific tasks use the right
set of binaries during their test.
This commit is contained in:
Joe Cropper 2020-04-23 11:58:33 -05:00 committed by Matt Clay
parent fce66b9707
commit e663391e77
4 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@
include_role: include_role:
name: setup_epel name: setup_epel
when: when:
- ansible_distribution in ['RedHat'] - ansible_distribution in ['RedHat', 'CentOS']
- ansible_distribution_major_version is version('7', '==') - ansible_distribution_major_version is version('7', '==')
- name: Include distribution specific variables - name: Include distribution specific variables

1
test/integration/targets/yum/aliases
View file

@ -1,6 +1,5 @@
destructive destructive
shippable/posix/group4 shippable/posix/group4
skip/aix skip/aix
skip/power/centos
skip/freebsd skip/freebsd
skip/osx skip/osx

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

@ -183,4 +183,4 @@
line: "proxy_password=1testpassword" line: "proxy_password=1testpassword"
state: absent state: absent
when: when:
- (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and ansible_distribution_major_version|int == 7) - (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and ansible_distribution_major_version|int == 7 and ansible_architecture in ['x86_64'])

25
test/integration/targets/yum/tasks/yum.yml
View file

@ -576,18 +576,39 @@
- "not yum_result is changed" - "not yum_result is changed"
- "'Packages providing httpd not installed due to update_only specified' in yum_result.results" - "'Packages providing httpd not installed due to update_only specified' in yum_result.results"
- name: try to install not compatible arch rpm, should fail - name: try to install uncompatible arch rpm on non-ppc64le, should fail
yum: yum:
name: https://s3.amazonaws.com/ansible-ci-files/test/integration/targets/yum/banner-1.3.4-3.el7.ppc64le.rpm name: https://s3.amazonaws.com/ansible-ci-files/test/integration/targets/yum/banner-1.3.4-3.el7.ppc64le.rpm
state: present state: present
register: yum_result register: yum_result
ignore_errors: True ignore_errors: True
when:
- ansible_architecture not in ['ppc64le']
- name: verify that yum failed - name: verify that yum failed on non-ppc64le
assert: assert:
that: that:
- "not yum_result is changed" - "not yum_result is changed"
- "yum_result is failed" - "yum_result is failed"
when:
- ansible_architecture not in ['ppc64le']
- name: try to install uncompatible arch rpm on ppc64le, should fail
yum:
name: https://s3.amazonaws.com/ansible-ci-files/test/integration/targets/yum/tinyproxy-1.10.0-3.el7.x86_64.rpm
state: present
register: yum_result
ignore_errors: True
when:
- ansible_architecture in ['ppc64le']
- name: verify that yum failed on ppc64le
assert:
that:
- "not yum_result is changed"
- "yum_result is failed"
when:
- ansible_architecture in ['ppc64le']
# setup for testing installing an RPM from url # setup for testing installing an RPM from url