laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30912 )

Change subject: ansible: replace deprecated include by import_tasks ......................................................................

ansible: replace deprecated include by import_tasks

include_tasks and import_tasks have similar functionality. Use import_tasks when importing non-variable depending files. Further use import_tasks when not used within a loop.

Closes: OS#5797 Change-Id: I29766c65b9e1601a20aa8f20a438e8368c65f6a8 --- M ansible/roles/docker/tasks/main.yml M ansible/roles/osmocom-workstation/tasks/main.yml 2 files changed, 3 insertions(+), 3 deletions(-)

Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified

diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index aa0fe4b..f64ae96 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -57,4 +57,4 @@ shell: "docker info | grep -q 'Storage Driver: overlay2' || rm -rf /var/lib/docker/vfs"

# After docker is set up, add docuum to clean old docker images -- include: docuum.yml +- import_tasks: docuum.yml diff --git a/ansible/roles/osmocom-workstation/tasks/main.yml b/ansible/roles/osmocom-workstation/tasks/main.yml index ae29111..0331207 100644 --- a/ansible/roles/osmocom-workstation/tasks/main.yml +++ b/ansible/roles/osmocom-workstation/tasks/main.yml @@ -9,8 +9,8 @@ shell: /usr/bin/zsh groups: docker

-- name: include git repos - include: git-repos.yml +- name: import git repos + import_tasks: git-repos.yml

- name: install distribution packages apt: