diff options
| author | Jordan Borean <jborean93@gmail.com> | 2019-02-01 07:39:19 +1000 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2019-01-31 13:39:19 -0800 |
| commit | 34b42ab48b1247dc424e8d880dec62d6024fb554 (patch) | |
| tree | dda5c0f3230b37ff65a65342893af555532c2d3d | |
| parent | 7e36064afd5c92bd51378a2d29ad0261603ca865 (diff) | |
| download | ansible-34b42ab48b1247dc424e8d880dec62d6024fb554.tar.gz | |
ansible-test: add Ubuntu 18.04 container (#50790) - 2.5 (#51156)
* 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)
* ansible-test: apt cleanup and futher 18.04 fixes (#50906)
(cherry picked from commit bbad033a5e8db9a79c1a7913d8c1f503b67288a9)
| -rw-r--r-- | shippable.yml | 3 | ||||
| -rw-r--r-- | test/integration/targets/apt_repository/tasks/apt.yml | 6 | ||||
| -rw-r--r-- | test/integration/targets/git/tasks/gpg-verification.yml | 2 | ||||
| -rw-r--r-- | test/runner/completion/docker.txt | 1 |
4 files changed, 12 insertions, 0 deletions
diff --git a/shippable.yml b/shippable.yml index a873a1f75e..a3e159d966 100644 --- a/shippable.yml +++ b/shippable.yml @@ -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 diff --git a/test/integration/targets/apt_repository/tasks/apt.yml b/test/integration/targets/apt_repository/tasks/apt.yml index add2997ab5..b93135a7ac 100644 --- a/test/integration/targets/apt_repository/tasks/apt.yml +++ b/test/integration/targets/apt_repository/tasks/apt.yml @@ -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 diff --git a/test/integration/targets/git/tasks/gpg-verification.yml b/test/integration/targets/git/tasks/gpg-verification.yml index 90d7022f4d..94e39a931a 100644 --- a/test/integration/targets/git/tasks/gpg-verification.yml +++ b/test/integration/targets/git/tasks/gpg-verification.yml @@ -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: diff --git a/test/runner/completion/docker.txt b/test/runner/completion/docker.txt index 44e7463d77..9d2b457e63 100644 --- a/test/runner/completion/docker.txt +++ b/test/runner/completion/docker.txt @@ -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 |