Fix lookup_passwordstore test skipping. (#49178)

* Fix lookup_passwordstore test skipping.

Skip all of RHEL instead of specific versions.
Skip all of CentOS < 7 instead of specific versions.

This makes the test more robust when testing newer versions.

Tests could be executed on RHEL if EPEL was installed during the test.
(cherry picked from commit 704dae2cda)
This commit is contained in:
Matt Clay 2018-11-26 23:25:27 -08:00 committed by Toshio Kuratomi
parent 34be89d8ce
commit 1986e9ed89
3 changed files with 7 additions and 8 deletions

View file

@ -1,2 +1,3 @@
shippable/posix/group2
destructive
skip/rhel

View file

@ -1,4 +1,6 @@
- include: "package.yml"
when: "ansible_distribution_version not in passwordstore_skip_os.get(ansible_distribution, [])"
- include: "tests.yml"
when: "ansible_distribution_version not in passwordstore_skip_os.get(ansible_distribution, [])"
- block:
- include: "package.yml"
- include: "tests.yml"
when:
- not (ansible_distribution == 'RedHat') # requires EPEL
- not (ansible_distribution == 'CentOS' and ansible_distribution_version is version_compare('7', '<'))

View file

@ -56,7 +56,3 @@ passwordstore_privkey: |
SxHTvI2pKk+gx0FB8wWhd/CocAHJpx9oNUs/7A==
=ZF3O
-----END PGP PRIVATE KEY BLOCK-----
passwordstore_skip_os:
Ubuntu: ['12.04']
RedHat: ['7.4']
CentOS: ['6.9', '6.10']