diff options
| author | Amin Vakil <info@aminvakil.com> | 2020-09-29 17:35:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 17:35:59 +0200 |
| commit | 8f02819db02459ed144e131db3808dee0a7356db (patch) | |
| tree | 78b053bac00d1347b606306208bc4d67a47cdb2d /test/integration/targets/apt/tasks | |
| parent | Fix sorting of ignore.txt (#71930) (diff) | |
| download | ansible-8f02819db02459ed144e131db3808dee0a7356db.tar.xz ansible-8f02819db02459ed144e131db3808dee0a7356db.zip | |
Replace deprectated include with {import,include}_tasks in apt{,_repository,_key} integration tests (#71964)
* Replace deprectated include with import_tasks
* Fix
Diffstat (limited to 'test/integration/targets/apt/tasks')
| -rw-r--r-- | test/integration/targets/apt/tasks/main.yml | 10 | ||||
| -rw-r--r-- | test/integration/targets/apt/tasks/repo.yml | 18 |
2 files changed, 20 insertions, 8 deletions
diff --git a/test/integration/targets/apt/tasks/main.yml b/test/integration/targets/apt/tasks/main.yml index 1ecd8a63d7..13d3e4f41f 100644 --- a/test/integration/targets/apt/tasks/main.yml +++ b/test/integration/targets/apt/tasks/main.yml @@ -16,18 +16,18 @@ # along with Ansible. If not, see <http://www.gnu.org/licenses/>. - block: - - include: 'apt.yml' + - import_tasks: 'apt.yml' - - include: 'url-with-deps.yml' + - import_tasks: 'url-with-deps.yml' - - include: 'apt-multiarch.yml' + - import_tasks: 'apt-multiarch.yml' when: - ansible_userspace_architecture != apt_foreign_arch - - include: 'apt-builddep.yml' + - import_tasks: 'apt-builddep.yml' - block: - - include: 'repo.yml' + - import_tasks: 'repo.yml' always: - file: path: /etc/apt/sources.list.d/file_tmp_repo.list diff --git a/test/integration/targets/apt/tasks/repo.yml b/test/integration/targets/apt/tasks/repo.yml index f568be9ffc..e1863f38b6 100644 --- a/test/integration/targets/apt/tasks/repo.yml +++ b/test/integration/targets/apt/tasks/repo.yml @@ -213,7 +213,11 @@ - name: Upgrades block: - - include: "upgrade.yml aptitude_present={{ True | bool }} upgrade_type=dist force_apt_get={{ False | bool }}" + - import_tasks: "upgrade.yml" + vars: + aptitude_present: "{{ True | bool }}" + upgrade_type: "dist" + force_apt_get: "{{ False | bool }}" - name: Check if aptitude is installed command: dpkg-query --show --showformat='${db:Status-Abbrev}' aptitude @@ -226,7 +230,11 @@ when: - aptitude_status.stdout.find('ii') != -1 - - include: "upgrade.yml aptitude_present={{ False | bool }} upgrade_type={{ item.upgrade_type }} force_apt_get={{ item.force_apt_get }}" + - include_tasks: "upgrade.yml" + vars: + aptitude_present: "{{ False | bool }}" + upgrade_type: "{{ item.upgrade_type }}" + force_apt_get: "{{ item.force_apt_get }}" with_items: - { upgrade_type: safe, force_apt_get: False } - { upgrade_type: full, force_apt_get: False } @@ -238,7 +246,11 @@ pkg: aptitude state: present - - include: "upgrade.yml aptitude_present={{ True | bool }} upgrade_type={{ item.upgrade_type }} force_apt_get={{ item.force_apt_get }}" + - include_tasks: "upgrade.yml" + vars: + aptitude_present: "{{ True | bool }}" + upgrade_type: "{{ item.upgrade_type }}" + force_apt_get: "{{ item.force_apt_get }}" with_items: - { upgrade_type: safe, force_apt_get: False } - { upgrade_type: full, force_apt_get: False } |