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

ansible-test: add Ubuntu 18.04 container (#50790)

Browse source 
* 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 commit 828df4b336)
This commit is contained in:
Jordan Borean 2019-01-22 10:30:35 +10:00 committed by Toshio Kuratomi
parent 44d7c1e23e
commit 7d52c07df2
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
shippable.yml
View file

@ -56,6 +56,7 @@ matrix:
- env: T=linux/ubuntu1404/1 - env: T=linux/ubuntu1404/1
- env: T=linux/ubuntu1604/1 - env: T=linux/ubuntu1604/1
- env: T=linux/ubuntu1604py3/1 - env: T=linux/ubuntu1604py3/1
- env: T=linux/ubuntu1804/1
- env: T=osx/10.11/2 - env: T=osx/10.11/2
- env: T=rhel/7.6/2 - env: T=rhel/7.6/2
@ -68,6 +69,7 @@ matrix:
- env: T=linux/ubuntu1404/2 - env: T=linux/ubuntu1404/2
- env: T=linux/ubuntu1604/2 - env: T=linux/ubuntu1604/2
- env: T=linux/ubuntu1604py3/2 - env: T=linux/ubuntu1604py3/2
- env: T=linux/ubuntu1804/2
- env: T=osx/10.11/3 - env: T=osx/10.11/3
- env: T=rhel/7.6/3 - env: T=rhel/7.6/3
@ -80,6 +82,7 @@ matrix:
- env: T=linux/ubuntu1404/3 - env: T=linux/ubuntu1404/3
- env: T=linux/ubuntu1604/3 - env: T=linux/ubuntu1604/3
- env: T=linux/ubuntu1604py3/3 - env: T=linux/ubuntu1604py3/3
- env: T=linux/ubuntu1804/3
- env: T=aws/2.7/1 - env: T=aws/2.7/1
- env: T=aws/3.6/1 - env: T=aws/3.6/1

2
test/integration/targets/git/tasks/gpg-verification.yml
View file

@ -183,6 +183,8 @@
- name: GPG-VERIFICATION | Stop gpg-agent so we can remove any locks on the GnuPG dir - name: GPG-VERIFICATION | Stop gpg-agent so we can remove any locks on the GnuPG dir
command: gpgconf --kill gpg-agent command: gpgconf --kill gpg-agent
when: ansible_os_family != 'Suse' # OpenSUSE ships with an older version of gpg-agent that doesn't support this 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 - name: GPG-VERIFICATION | Remove GnuPG verification workdir
file: file:

1
test/runner/completion/docker.txt
View 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 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 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 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