* ansible-test: add Ubuntu 18.04 container (#50790) * ansible-test: Add Ubuntu 18.04 to Shippable CI nodes * re-add ubuntu1604/3 to matrix * forgot to add environment for git kill gpg-agent (cherry picked from commit828df4b336
) * ansible-test: apt cleanup and futher 18.04 fixes (#50906) (cherry picked from commitbbad033a5e
)
This commit is contained in:
parent
7e36064afd
commit
34b42ab48b
4 changed files with 12 additions and 0 deletions
|
@ -56,6 +56,7 @@ matrix:
|
|||
- env: T=linux/ubuntu1404/1
|
||||
- env: T=linux/ubuntu1604/1
|
||||
- env: T=linux/ubuntu1604py3/1
|
||||
- env: T=linux/ubuntu1804/1
|
||||
|
||||
- env: T=osx/10.11/2
|
||||
- env: T=rhel/7.6/2
|
||||
|
@ -68,6 +69,7 @@ matrix:
|
|||
- env: T=linux/ubuntu1404/2
|
||||
- env: T=linux/ubuntu1604/2
|
||||
- env: T=linux/ubuntu1604py3/2
|
||||
- env: T=linux/ubuntu1804/2
|
||||
|
||||
- env: T=osx/10.11/3
|
||||
- env: T=rhel/7.6/3
|
||||
|
@ -80,6 +82,7 @@ matrix:
|
|||
- env: T=linux/ubuntu1404/3
|
||||
- env: T=linux/ubuntu1604/3
|
||||
- env: T=linux/ubuntu1604py3/3
|
||||
- env: T=linux/ubuntu1804/3
|
||||
|
||||
- env: T=aws/2.7/1
|
||||
- env: T=aws/3.6/1
|
||||
|
|
|
@ -135,6 +135,9 @@
|
|||
stat: path='/var/cache/apt/pkgcache.bin'
|
||||
register: cache_before
|
||||
|
||||
- name: ensure ppa key is present before adding repo that requires authentication
|
||||
apt_key: keyserver=keyserver.ubuntu.com id='{{test_ppa_key}}' state=present
|
||||
|
||||
- name: 'name=<spec> (expect: pass)'
|
||||
apt_repository: repo='{{test_ppa_spec}}' state=present
|
||||
register: result
|
||||
|
@ -167,6 +170,9 @@
|
|||
stat: path='/var/cache/apt/pkgcache.bin'
|
||||
register: cache_before
|
||||
|
||||
- name: ensure ppa key is present before adding repo that requires authentication
|
||||
apt_key: keyserver=keyserver.ubuntu.com id='{{test_ppa_key}}' state=present
|
||||
|
||||
- name: 'name=<spec> filename=<filename> (expect: pass)'
|
||||
apt_repository: repo='{{test_ppa_spec}}' filename='{{test_ppa_filename}}' state=present
|
||||
register: result
|
||||
|
|
|
@ -183,6 +183,8 @@
|
|||
- name: GPG-VERIFICATION | Stop gpg-agent so we can remove any locks on the GnuPG dir
|
||||
command: gpgconf --kill gpg-agent
|
||||
when: ansible_os_family != 'Suse' # OpenSUSE ships with an older version of gpg-agent that doesn't support this
|
||||
environment:
|
||||
GNUPGHOME: "{{ git_gpg_gpghome }}"
|
||||
|
||||
- name: GPG-VERIFICATION | Remove GnuPG verification workdir
|
||||
file:
|
||||
|
|
|
@ -7,3 +7,4 @@ opensuse42.3 name=quay.io/ansible/opensuse42.3-test-container:1.4.0 seccomp=unco
|
|||
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
|
||||
ubuntu1604py3 name=quay.io/ansible/ubuntu1604py3-test-container:1.4.0 seccomp=unconfined python=3
|
||||
ubuntu1804 name=quay.io/ansible/ubuntu1804-test-container:1.6.0 seccomp=unconfined python=3
|
||||
|
|
Loading…
Reference in a new issue