ansible-test: apt cleanup and futher 18.04 fixes (#50906)
This commit is contained in:
parent
09bfe42a5c
commit
bbad033a5e
2 changed files with 8 additions and 2 deletions
|
@ -27,8 +27,8 @@
|
||||||
- block:
|
- block:
|
||||||
- include: 'repo.yml'
|
- include: 'repo.yml'
|
||||||
always:
|
always:
|
||||||
- apt_repository:
|
- file:
|
||||||
repo: "deb file:{{ repodir }} ./"
|
path: /etc/apt/sources.list.d/file_tmp_repo.list
|
||||||
state: absent
|
state: absent
|
||||||
- file:
|
- file:
|
||||||
name: "{{ repodir }}"
|
name: "{{ repodir }}"
|
||||||
|
|
|
@ -135,6 +135,9 @@
|
||||||
stat: path='/var/cache/apt/pkgcache.bin'
|
stat: path='/var/cache/apt/pkgcache.bin'
|
||||||
register: cache_before
|
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)'
|
- name: 'name=<spec> (expect: pass)'
|
||||||
apt_repository: repo='{{test_ppa_spec}}' state=present
|
apt_repository: repo='{{test_ppa_spec}}' state=present
|
||||||
register: result
|
register: result
|
||||||
|
@ -167,6 +170,9 @@
|
||||||
stat: path='/var/cache/apt/pkgcache.bin'
|
stat: path='/var/cache/apt/pkgcache.bin'
|
||||||
register: cache_before
|
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)'
|
- name: 'name=<spec> filename=<filename> (expect: pass)'
|
||||||
apt_repository: repo='{{test_ppa_spec}}' filename='{{test_ppa_filename}}' state=present
|
apt_repository: repo='{{test_ppa_spec}}' filename='{{test_ppa_filename}}' state=present
|
||||||
register: result
|
register: result
|
||||||
|
|
Loading…
Reference in a new issue