wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ansible-test: change Fedora 24, 25 to 28, 29 (#49586) - 2.5 (#49587)

Browse source 
* ansible-test: change Fedora 24 to 28 (#49586)

(cherry picked from commit 5392caee14)

* fix openssl_certificate tests

* ansible-test - swap Fedora 25 for 29 (#49634)

(cherry picked from commit 6a09db5131)

* test make sure everything passes

* Fix rpm_key test on Fedora 27.

(cherry picked from commit 39aa50022a)

* skip yum tests on Fedora hosts
This commit is contained in:
Jordan Borean 2018-12-22 11:17:35 +10:00 committed by Matt Clay
parent 64c913b46f
commit 6dbea6d19e
5 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
shippable.yml
View file

@ -50,8 +50,8 @@ matrix:
- env: T=freebsd/11.1/1
- env: T=linux/centos6/1
- env: T=linux/centos7/1
- env: T=linux/fedora24/1
- env: T=linux/fedora25/1
- env: T=linux/fedora28/1
- env: T=linux/fedora29/1
- env: T=linux/opensuse42.3/1
- env: T=linux/ubuntu1404/1
- env: T=linux/ubuntu1604/1
@ -62,8 +62,8 @@ matrix:
- env: T=freebsd/11.1/2
- env: T=linux/centos6/2
- env: T=linux/centos7/2
- env: T=linux/fedora24/2
- env: T=linux/fedora25/2
- env: T=linux/fedora28/2
- env: T=linux/fedora29/2
- env: T=linux/opensuse42.3/2
- env: T=linux/ubuntu1404/2
- env: T=linux/ubuntu1604/2
@ -74,8 +74,8 @@ matrix:
- env: T=freebsd/11.1/3
- env: T=linux/centos6/3
- env: T=linux/centos7/3
- env: T=linux/fedora24/3
- env: T=linux/fedora25/3
- env: T=linux/fedora28/3
- env: T=linux/fedora29/3
- env: T=linux/opensuse42.3/3
- env: T=linux/ubuntu1404/3
- env: T=linux/ubuntu1604/3

3
test/integration/targets/openssl_certificate/tests/validate.yml
View file

@ -20,7 +20,8 @@
that:
- cert_modulus.stdout == privatekey_modulus.stdout
- cert_version.stdout == '3'
- cert_issuer.stdout == 'CN=www.example.com'
# openssl 1.1.x adds a space in it's output
- cert_issuer.stdout in ['CN=www.example.com', 'CN = www.example.com']
- name: Validate certificate idempotence
assert:

10
test/integration/targets/rpm_key/tasks/rpm_key.yaml
View file

@ -47,7 +47,7 @@
- name: confirm that signature check failed
assert:
that:
- "'MISSING KEYS' in sl_check.stdout"
- "'MISSING KEYS' in sl_check.stdout or 'SIGNATURES NOT OK' in sl_check.stdout"
- "sl_check.failed"
- name: remove EPEL GPG key from keyring (idempotent)
@ -91,7 +91,7 @@
- name: confirm that signature check succeeded
assert:
that: "'rsa sha1 (md5) pgp md5 OK' in sl_check.stdout"
that: "'rsa sha1 (md5) pgp md5 OK' in sl_check.stdout or 'digests signatures OK' in sl_check.stdout"
- name: remove GPG key from url
rpm_key:
@ -106,7 +106,7 @@
- name: confirm that signature check failed
assert:
that:
- "'MISSING KEYS' in sl_check.stdout"
- "'MISSING KEYS' in sl_check.stdout or 'SIGNATURES NOT OK' in sl_check.stdout"
- "sl_check.failed"
- name: add GPG key from url
@ -120,7 +120,7 @@
- name: confirm that signature check succeeded
assert:
that: "'rsa sha1 (md5) pgp md5 OK' in sl_check.stdout"
that: "'rsa sha1 (md5) pgp md5 OK' in sl_check.stdout or 'digests signatures OK' in sl_check.stdout"
- name: remove all keys from key ring
shell: "rpm -q gpg-pubkey | xargs rpm -e"
@ -136,7 +136,7 @@
- name: confirm that signature check succeeded
assert:
that: "'rsa sha1 (md5) pgp md5 OK' in sl_check.stdout"
that: "'rsa sha1 (md5) pgp md5 OK' in sl_check.stdout or 'digests signatures OK' in sl_check.stdout"
#
# Cleanup

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

@ -47,11 +47,17 @@
when:
- ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux', 'Fedora']
- ansible_python.version.major == 2
# yum in Fedora 28 is deprecated and does not support boolean (rich) dependencies used in the tests.
# https://bugzilla.redhat.com/show_bug.cgi?id=1489315
- not (ansible_distribution == 'Fedora' and ansible_distribution_version == '28')
- include: 'repo.yml'
when:
- ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux', 'Fedora']
- ansible_python.version.major == 2
# yum in Fedora 28 is deprecated and does not support boolean (rich) dependencies used in the tests.
# https://bugzilla.redhat.com/show_bug.cgi?id=1489315
- not (ansible_distribution == 'Fedora' and ansible_distribution_version == '28')
# We can't run yum --installroot tests on dnf systems. Dnf systems revert to
# yum-deprecated, and yum-deprecated refuses to run if yum.conf exists
@ -69,3 +75,6 @@
when:
- (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and ansible_distribution_major_version|int > 6) or ansible_distribution in ['Fedora']
- ansible_python.version.major == 2
# yum in Fedora 28 is deprecated and does not support boolean (rich) dependencies used in the tests.
# https://bugzilla.redhat.com/show_bug.cgi?id=1489315
- not (ansible_distribution == 'Fedora' and ansible_distribution_version == '28')

6
test/runner/completion/docker.txt
View file

@ -1,10 +1,8 @@
default name=quay.io/ansible/default-test-container:1.4.1 python=3
centos6 name=quay.io/ansible/centos6-test-container:1.4.0 seccomp=unconfined
centos7 name=quay.io/ansible/centos7-test-container:1.4.0 seccomp=unconfined
fedora24 name=quay.io/ansible/fedora24-test-container:1.4.0 seccomp=unconfined
fedora25 name=quay.io/ansible/fedora25-test-container:1.4.0 seccomp=unconfined
fedora26py3 name=quay.io/ansible/fedora26py3-test-container:1.4.0 python=3
fedora27py3 name=quay.io/ansible/fedora27py3-test-container:1.4.0 python=3
fedora28 name=quay.io/ansible/fedora28-test-container:1.5.0
fedora29 name=quay.io/ansible/fedora29-test-container:1.5.0 python=3
opensuse42.3 name=quay.io/ansible/opensuse42.3-test-container:1.4.0 seccomp=unconfined
ubuntu1404 name=quay.io/ansible/ubuntu1404-test-container:1.4.0 seccomp=unconfined
ubuntu1604 name=quay.io/ansible/ubuntu1604-test-container:1.4.0 seccomp=unconfined