Browse code
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 commit 828df4b33614de2144e9e9fb93a74dc36b73d252)
Jordan Borean authored on 2019/01/22 09:30:35Showing 3 changed files
- shippable.yml
- test/integration/targets/git/tasks/gpg-verification.yml
- test/runner/completion/docker.txt
| ... | ... |
@@ -56,6 +56,7 @@ matrix: |
| 56 | 56 |
- env: T=linux/ubuntu1404/1 |
| 57 | 57 |
- env: T=linux/ubuntu1604/1 |
| 58 | 58 |
- env: T=linux/ubuntu1604py3/1 |
| 59 |
+ - env: T=linux/ubuntu1804/1 |
|
| 59 | 60 |
|
| 60 | 61 |
- env: T=osx/10.11/2 |
| 61 | 62 |
- env: T=rhel/7.6/2 |
| ... | ... |
@@ -68,6 +69,7 @@ matrix: |
| 68 | 68 |
- env: T=linux/ubuntu1404/2 |
| 69 | 69 |
- env: T=linux/ubuntu1604/2 |
| 70 | 70 |
- env: T=linux/ubuntu1604py3/2 |
| 71 |
+ - env: T=linux/ubuntu1804/2 |
|
| 71 | 72 |
|
| 72 | 73 |
- env: T=osx/10.11/3 |
| 73 | 74 |
- env: T=rhel/7.6/3 |
| ... | ... |
@@ -80,6 +82,7 @@ matrix: |
| 80 | 80 |
- env: T=linux/ubuntu1404/3 |
| 81 | 81 |
- env: T=linux/ubuntu1604/3 |
| 82 | 82 |
- env: T=linux/ubuntu1604py3/3 |
| 83 |
+ - env: T=linux/ubuntu1804/3 |
|
| 83 | 84 |
|
| 84 | 85 |
- env: T=aws/2.7/1 |
| 85 | 86 |
- env: T=aws/3.6/1 |
| ... | ... |
@@ -183,6 +183,8 @@ |
| 183 | 183 |
- name: GPG-VERIFICATION | Stop gpg-agent so we can remove any locks on the GnuPG dir |
| 184 | 184 |
command: gpgconf --kill gpg-agent |
| 185 | 185 |
when: ansible_os_family != 'Suse' # OpenSUSE ships with an older version of gpg-agent that doesn't support this |
| 186 |
+ environment: |
|
| 187 |
+ GNUPGHOME: "{{ git_gpg_gpghome }}"
|
|
| 186 | 188 |
|
| 187 | 189 |
- name: GPG-VERIFICATION | Remove GnuPG verification workdir |
| 188 | 190 |
file: |
| ... | ... |
@@ -7,3 +7,4 @@ opensuse42.3 name=quay.io/ansible/opensuse42.3-test-container:1.4.0 seccomp=unco |
| 7 | 7 |
ubuntu1404 name=quay.io/ansible/ubuntu1404-test-container:1.4.0 seccomp=unconfined |
| 8 | 8 |
ubuntu1604 name=quay.io/ansible/ubuntu1604-test-container:1.4.0 seccomp=unconfined |
| 9 | 9 |
ubuntu1604py3 name=quay.io/ansible/ubuntu1604py3-test-container:1.4.0 seccomp=unconfined python=3 |
| 10 |
+ubuntu1804 name=quay.io/ansible/ubuntu1804-test-container:1.6.0 seccomp=unconfined python=3 |