guests: lcitool: ansible: Replace 'include' keyword

Ansible core 5 (2.12.5) started to issue deprecation warnings about
usage of the 'include' keyword which should be replaced either by
include_tasks or import_tasks. Given our use case (splitting task
modules logically) and since includes are dynamic
(hence evaluated during runtime) replacing most of the includes with
'import_tasks' which are static (hence evaluated during playbook
parsing) seems like a better choice only using 'include_tasks' whenever
we need a conditional or a loop to be paired with the include.

Signed-off-by: Erik Skultety <eskultet@redhat.com>

19 files changed, 79 insertions, 79 deletions

diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/main.yml b/guests/lcitool/lcitool/ansible/playbooks/build/main.yml
index abdf2a9..3d68d78 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/main.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/main.yml
@@ -7,9 +7,9 @@
 
   tasks:
     - name: Pre-build setup
-      include_tasks: 'tasks/pre-build/main.yml'
+      import_tasks: 'tasks/pre-build/main.yml'
 
-    - include: 'projects/{{ project }}.yml'
+    - include_tasks: 'projects/{{ project }}.yml'
       loop:
         '{{ selected_projects }}'
       loop_control:
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/gtk-vnc.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/gtk-vnc.yml
index d73e855..d7091d5 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/gtk-vnc.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/gtk-vnc.yml
@@ -5,9 +5,9 @@
     archive_format: xz
     git_url: '{{ git_urls["gtk-vnc"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/meson-build-job.yml'
-- include: 'jobs/meson-check-job.yml'
-- include: 'jobs/meson-rpm-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/meson-build-job.yml'
+- import_tasks: 'jobs/meson-check-job.yml'
+- import_tasks: 'jobs/meson-rpm-job.yml'
   vars:
     machines: '{{ rpm_machines }}'
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libosinfo.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libosinfo.yml
index 9e0dff7..962b4b0 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libosinfo.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libosinfo.yml
@@ -5,9 +5,9 @@
     archive_format: xz
     git_url: '{{ git_urls["libosinfo"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/meson-build-job.yml'
-- include: 'jobs/meson-check-job.yml'
-- include: 'jobs/meson-rpm-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/meson-build-job.yml'
+- import_tasks: 'jobs/meson-check-job.yml'
+- import_tasks: 'jobs/meson-rpm-job.yml'
   vars:
     machines: '{{ rpm_machines }}'
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-cim.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-cim.yml
index 8f951c4..8351667 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-cim.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-cim.yml
@@ -5,6 +5,6 @@
     archive_format: gz
     git_url: '{{ git_urls["libvirt-cim"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/autotools-build-job.yml'
-- include: 'jobs/autotools-rpm-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/autotools-build-job.yml'
+- import_tasks: 'jobs/autotools-rpm-job.yml'
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-dbus.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-dbus.yml
index 2b7b883..20346b6 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-dbus.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-dbus.yml
@@ -5,9 +5,9 @@
     archive_format: xz
     git_url: '{{ git_urls["libvirt-dbus"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/meson-build-job.yml'
-- include: 'jobs/meson-check-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/meson-build-job.yml'
+- import_tasks: 'jobs/meson-check-job.yml'
   vars:
     # flake8 and pyflakes versions currently available on FreeBSD
     # (3.5.0 and 2.0.0 respectively) are not compatible.
@@ -25,6 +25,6 @@
       - opensuse-tumbleweed
       - ubuntu-2004
       - ubuntu-2204
-- include: 'jobs/meson-rpm-job.yml'
+- import_tasks: 'jobs/meson-rpm-job.yml'
   vars:
     machines: '{{ rpm_machines }}'
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-glib.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-glib.yml
index fa584cc..692c13f 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-glib.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-glib.yml
@@ -5,9 +5,9 @@
     archive_format: gz
     git_url: '{{ git_urls["libvirt-glib"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/meson-build-job.yml'
-- include: 'jobs/meson-check-job.yml'
-- include: 'jobs/meson-rpm-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/meson-build-job.yml'
+- import_tasks: 'jobs/meson-check-job.yml'
+- import_tasks: 'jobs/meson-rpm-job.yml'
   vars:
     machines: '{{ rpm_machines }}'
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-go-xml.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-go-xml.yml
index 6678dfa..d3139e8 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-go-xml.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-go-xml.yml
@@ -5,9 +5,9 @@
     archive_format: gz
     git_url: '{{ git_urls["libvirt-go-xml"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/go-build-job.yml'
-- include: 'jobs/go-check-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/go-build-job.yml'
+- import_tasks: 'jobs/go-check-job.yml'
   vars:
     local_env: |
       export TEST_ARGS="-tags xmlroundtrip"
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-go.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-go.yml
index a2130b5..9602d9e 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-go.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-go.yml
@@ -5,9 +5,9 @@
     archive_format: gz
     git_url: '{{ git_urls["libvirt-go"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/go-build-job.yml'
-- include: 'jobs/go-check-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/go-build-job.yml'
+- import_tasks: 'jobs/go-check-job.yml'
   vars:
     local_env: |
       export TEST_ARGS="-tags api"
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-ocaml.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-ocaml.yml
index ebda861..4e37a75 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-ocaml.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-ocaml.yml
@@ -5,15 +5,15 @@
     archive_format: xz
     git_url: '{{ git_urls["libvirt-ocaml"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/generic-build-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/generic-build-job.yml'
   vars:
     command: |
       autoreconf -vfi
       ./configure --prefix=$VIRT_PREFIX
       $MAKE
       $MAKE opt
-- include: 'jobs/generic-check-job.yml'
+- import_tasks: 'jobs/generic-check-job.yml'
   vars:
     command: |
       $MAKE check-manifest
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-perl.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-perl.yml
index 3b6d068..ffa47be 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-perl.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-perl.yml
@@ -5,15 +5,15 @@
     archive_format: gz
     git_url: '{{ git_urls["libvirt-perl"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/perl-modulebuild-build-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/perl-modulebuild-build-job.yml'
   vars:
     local_env: |
       export TEST_MAINTAINER=1
-- include: 'jobs/perl-modulebuild-check-job.yml'
+- import_tasks: 'jobs/perl-modulebuild-check-job.yml'
   vars:
     local_env: |
       export TEST_MAINTAINER=1
-- include: 'jobs/perl-modulebuild-rpm-job.yml'
+- import_tasks: 'jobs/perl-modulebuild-rpm-job.yml'
   vars:
     machines: '{{ rpm_machines }}'
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-python.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-python.yml
index e7dae24..94c2792 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-python.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-python.yml
@@ -5,9 +5,9 @@
     archive_format: gz
     git_url: '{{ git_urls["libvirt-python"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/python-distutils-build-job.yml'
-- include: 'jobs/python-distutils-check-job.yml'
-- include: 'jobs/python-distutils-rpm-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/python-distutils-build-job.yml'
+- import_tasks: 'jobs/python-distutils-check-job.yml'
+- import_tasks: 'jobs/python-distutils-rpm-job.yml'
   vars:
     machines: '{{ rpm_machines }}'
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-sandbox.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-sandbox.yml
index 9bfb519..bcf62b9 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-sandbox.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-sandbox.yml
@@ -16,13 +16,13 @@
     archive_format: gz
     git_url: '{{ git_urls["libvirt-sandbox"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/autotools-build-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/autotools-build-job.yml'
   vars:
     autogen_args: --enable-gtk-doc
-- include: 'jobs/autotools-syntax-check-job.yml'
-- include: 'jobs/autotools-check-job.yml'
-- include: 'jobs/autotools-rpm-job.yml'
+- import_tasks: 'jobs/autotools-syntax-check-job.yml'
+- import_tasks: 'jobs/autotools-check-job.yml'
+- import_tasks: 'jobs/autotools-rpm-job.yml'
   vars:
     machines:
       - fedora-35
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-tck.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-tck.yml
index 6e501d7..e4beddd 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-tck.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-tck.yml
@@ -5,13 +5,13 @@
     archive_format: gz
     git_url: '{{ git_urls["libvirt-tck"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/perl-modulebuild-build-job.yml'
-- include: 'jobs/perl-modulebuild-check-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/perl-modulebuild-build-job.yml'
+- import_tasks: 'jobs/perl-modulebuild-check-job.yml'
 
   # CentOS releases are missing a number of RPM Perl modules, so we
   # can't do the rpmbuild there
-- include: 'jobs/perl-modulebuild-rpm-job.yml'
+- import_tasks: 'jobs/perl-modulebuild-rpm-job.yml'
   vars:
     machines:
       - fedora-35
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt.yml
index 0b7fde6..7b6cd7e 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt.yml
@@ -5,9 +5,9 @@
     archive_format: xz
     git_url: '{{ git_urls["libvirt"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/meson-build-job.yml'
-- include: 'jobs/meson-syntax-check-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/meson-build-job.yml'
+- import_tasks: 'jobs/meson-syntax-check-job.yml'
   vars:
     # We limit syntax-check to Linux platforms because it calls some
     # commands with more arguments than FreeBSD supports
@@ -25,7 +25,7 @@
       - opensuse-tumbleweed
       - ubuntu-2004
       - ubuntu-2204
-- include: 'jobs/meson-check-job.yml'
+- import_tasks: 'jobs/meson-check-job.yml'
   vars:
     local_env: |
       # gnulib's test-poll is broken on FreeBSD, so disable expensive
@@ -34,6 +34,6 @@
         export VIR_TEST_EXPENSIVE=1
       fi
       export VIR_TEST_DEBUG=2
-- include: 'jobs/meson-rpm-job.yml'
+- import_tasks: 'jobs/meson-rpm-job.yml'
   vars:
     machines: '{{ rpm_machines }}'
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/osinfo-db-tools.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/osinfo-db-tools.yml
index 77259e9..445cb80 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/osinfo-db-tools.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/osinfo-db-tools.yml
@@ -5,9 +5,9 @@
     archive_format: xz
     git_url: '{{ git_urls["osinfo-db-tools"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/meson-build-job.yml'
-- include: 'jobs/meson-check-job.yml'
-- include: 'jobs/meson-rpm-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/meson-build-job.yml'
+- import_tasks: 'jobs/meson-check-job.yml'
+- import_tasks: 'jobs/meson-rpm-job.yml'
   vars:
     machines: '{{ rpm_machines }}'
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/osinfo-db.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/osinfo-db.yml
index ffb5933..5309e3d 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/osinfo-db.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/osinfo-db.yml
@@ -5,17 +5,17 @@
     archive_format: xz
     git_url: '{{ git_urls["osinfo-db"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/generic-build-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/generic-build-job.yml'
   vars:
     command: |
       $MAKE all
       $MAKE install OSINFO_DB_TARGET="--system"
-- include: 'jobs/generic-check-job.yml'
+- import_tasks: 'jobs/generic-check-job.yml'
   vars:
     command: |
       $MAKE check
-- include: 'jobs/generic-rpm-job.yml'
+- import_tasks: 'jobs/generic-rpm-job.yml'
   vars:
     machines: '{{ rpm_machines }}'
     command: |
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/virt-manager.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/virt-manager.yml
index e120b27..6820c72 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/virt-manager.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/virt-manager.yml
@@ -5,14 +5,14 @@
     archive_format: gz
     git_url: '{{ git_urls["virt-manager"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/python-distutils-build-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/python-distutils-build-job.yml'
   vars:
     command_pre_build: |
       $PYTHON ./setup.py configure --prefix=$VIRT_PREFIX
-- include: 'jobs/python-distutils-check-job.yml'
+- import_tasks: 'jobs/python-distutils-check-job.yml'
   vars:
     machines: '{{ all_machines }}'
-- include: 'jobs/python-distutils-rpm-job.yml'
+- import_tasks: 'jobs/python-distutils-rpm-job.yml'
   vars:
     machines: '{{ rpm_machines }}'
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/virt-viewer.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/virt-viewer.yml
index 4c2f0f5..209885a 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/virt-viewer.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/virt-viewer.yml
@@ -5,10 +5,10 @@
     archive_format: gz
     git_url: '{{ git_urls["virt-viewer"][git_remote] }}'
 
-- include: 'jobs/prepare.yml'
-- include: 'jobs/meson-build-job.yml'
-- include: 'jobs/meson-check-job.yml'
-- include: 'jobs/meson-rpm-job.yml'
+- import_tasks: 'jobs/prepare.yml'
+- import_tasks: 'jobs/meson-build-job.yml'
+- import_tasks: 'jobs/meson-check-job.yml'
+- import_tasks: 'jobs/meson-rpm-job.yml'
   vars:
     # The spec file for virt-viewer requires a very recent version
     # of spice-gtk, so we have to skip this job on older distros
diff --git a/guests/lcitool/lcitool/ansible/playbooks/update/main.yml b/guests/lcitool/lcitool/ansible/playbooks/update/main.yml
index b82891b..68569c2 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/update/main.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/update/main.yml
@@ -6,7 +6,7 @@
   tasks:
 
     # Bootstrap Ansible itself
-    - include: 'tasks/bootstrap.yml'
+    - import_tasks: 'tasks/bootstrap.yml'
 
 - hosts: all
   remote_user: root
@@ -15,32 +15,32 @@
 
     # Prepare environment. None of the actions performed here might
     # depend on packages being installed
-    - include: 'tasks/base.yml'
+    - import_tasks: 'tasks/base.yml'
 
     # Install/Remove packages
-    - include: 'tasks/packages.yml'
+    - import_tasks: 'tasks/packages.yml'
 
     # Configure environment. Needs to happen after installing packages
-    - include: 'tasks/kludges.yml'
-    - include: 'tasks/services.yml'
-    - include: 'tasks/users.yml'
-    - include: 'tasks/ccache.yml'
+    - import_tasks: 'tasks/kludges.yml'
+    - import_tasks: 'tasks/services.yml'
+    - import_tasks: 'tasks/users.yml'
+    - import_tasks: 'tasks/ccache.yml'
       when:
         - '"ccache" in packages'
 
     # The following should only run on locally installed VMs
     - block:
-      - include: 'tasks/bootloader.yml'
-      - include: 'tasks/hostname.yml'
+      - import_tasks: 'tasks/bootloader.yml'
+      - import_tasks: 'tasks/hostname.yml'
       when:
         - fully_managed | default(False)
 
     # Install the Gitlab runner agent
-    - include: 'tasks/gitlab.yml'
+    - import_tasks: 'tasks/gitlab.yml'
       when:
         - install.flavor == 'gitlab'
 
     # Configure cloud-init
-    - include: 'tasks/cloud-init.yml'
+    - import_tasks: 'tasks/cloud-init.yml'
       when:
         - install.cloud_init