Re: [libvirt-ci PATCH 3/4] lcitool: Store packaging information as a dictionary

2020-04-29 Thread Erik Skultety 
On Tue, Apr 28, 2020 at 03:37:59PM +0200, Andrea Bolognani wrote:
> Ansible and Python both support actual dictionaries, so make use
> of them in the inventory instead of emulating them by using
> variable names sharing the same prefix.
> 
> Signed-off-by: Andrea Bolognani 
Reviewed-by: Erik Skultety

[libvirt-ci PATCH 3/4] lcitool: Store packaging information as a dictionary

2020-04-28 Thread Andrea Bolognani 
Ansible and Python both support actual dictionaries, so make use
of them in the inventory instead of emulating them by using
variable names sharing the same prefix.

Signed-off-by: Andrea Bolognani 
---
 guests/host_vars/libvirt-centos-7/main.yml|  5 +-
 guests/host_vars/libvirt-centos-8/main.yml|  5 +-
 guests/host_vars/libvirt-debian-10/main.yml   |  5 +-
 guests/host_vars/libvirt-debian-9/main.yml|  5 +-
 guests/host_vars/libvirt-debian-sid/main.yml  |  5 +-
 guests/host_vars/libvirt-fedora-30/main.yml   |  5 +-
 guests/host_vars/libvirt-fedora-31/main.yml   |  5 +-
 .../host_vars/libvirt-fedora-rawhide/main.yml |  5 +-
 guests/host_vars/libvirt-freebsd-11/main.yml  |  5 +-
 guests/host_vars/libvirt-freebsd-12/main.yml  |  5 +-
 .../libvirt-freebsd-current/main.yml  |  5 +-
 .../host_vars/libvirt-opensuse-151/main.yml   |  5 +-
 guests/host_vars/libvirt-ubuntu-1604/main.yml |  5 +-
 guests/host_vars/libvirt-ubuntu-1804/main.yml |  5 +-
 guests/lcitool| 79 ---
 guests/playbooks/update/tasks/base.yml| 28 +++
 guests/playbooks/update/tasks/bootstrap.yml   |  6 +-
 guests/playbooks/update/tasks/packages.yml|  8 +-
 guests/playbooks/update/tasks/services.yml|  2 +-
 guests/playbooks/update/templates/bashrc.j2   |  6 +-
 20 files changed, 101 insertions(+), 98 deletions(-)

diff --git a/guests/host_vars/libvirt-centos-7/main.yml 
b/guests/host_vars/libvirt-centos-7/main.yml
index ac40c7c..66cb113 100644
--- a/guests/host_vars/libvirt-centos-7/main.yml
+++ b/guests/host_vars/libvirt-centos-7/main.yml
@@ -19,8 +19,9 @@ os:
   name: 'CentOS'
   version: '7'
 
-package_format: 'rpm'
-package_manager: 'yum'
+packaging:
+  format: rpm
+  command: yum
 
 bash: /bin/bash
 cc: /usr/bin/gcc
diff --git a/guests/host_vars/libvirt-centos-8/main.yml 
b/guests/host_vars/libvirt-centos-8/main.yml
index 77ba6b1..e48c1ff 100644
--- a/guests/host_vars/libvirt-centos-8/main.yml
+++ b/guests/host_vars/libvirt-centos-8/main.yml
@@ -19,8 +19,9 @@ os:
   name: 'CentOS'
   version: '8'
 
-package_format: 'rpm'
-package_manager: 'dnf'
+packaging:
+  format: 'rpm'
+  command: 'dnf'
 
 bash: /bin/bash
 cc: /usr/bin/gcc
diff --git a/guests/host_vars/libvirt-debian-10/main.yml 
b/guests/host_vars/libvirt-debian-10/main.yml
index cb859d1..da30dac 100644
--- a/guests/host_vars/libvirt-debian-10/main.yml
+++ b/guests/host_vars/libvirt-debian-10/main.yml
@@ -21,8 +21,9 @@ os:
   name: 'Debian'
   version: '10'
 
-package_format: 'deb'
-package_manager: 'apt-get'
+packaging:
+  format: 'deb'
+  command: 'apt-get'
 
 bash: /bin/bash
 cc: /usr/bin/gcc
diff --git a/guests/host_vars/libvirt-debian-9/main.yml 
b/guests/host_vars/libvirt-debian-9/main.yml
index c9b739d..82ed8b2 100644
--- a/guests/host_vars/libvirt-debian-9/main.yml
+++ b/guests/host_vars/libvirt-debian-9/main.yml
@@ -21,8 +21,9 @@ os:
   name: 'Debian'
   version: '9'
 
-package_format: 'deb'
-package_manager: 'apt-get'
+packaging:
+  format: 'deb'
+  command: 'apt-get'
 
 bash: /bin/bash
 cc: /usr/bin/gcc
diff --git a/guests/host_vars/libvirt-debian-sid/main.yml 
b/guests/host_vars/libvirt-debian-sid/main.yml
index 6e1adda..f0c0c8e 100644
--- a/guests/host_vars/libvirt-debian-sid/main.yml
+++ b/guests/host_vars/libvirt-debian-sid/main.yml
@@ -21,8 +21,9 @@ os:
   name: 'Debian'
   version: 'Sid'
 
-package_format: 'deb'
-package_manager: 'apt-get'
+packaging:
+  format: 'deb'
+  command: 'apt-get'
 
 bash: /bin/bash
 cc: /usr/bin/gcc
diff --git a/guests/host_vars/libvirt-fedora-30/main.yml 
b/guests/host_vars/libvirt-fedora-30/main.yml
index 2a317c3..d9e539e 100644
--- a/guests/host_vars/libvirt-fedora-30/main.yml
+++ b/guests/host_vars/libvirt-fedora-30/main.yml
@@ -34,8 +34,9 @@ os:
   name: 'Fedora'
   version: '30'
 
-package_format: 'rpm'
-package_manager: 'dnf'
+packaging:
+  format: 'rpm'
+  command: 'dnf'
 
 bash: /bin/bash
 cc: /usr/bin/gcc
diff --git a/guests/host_vars/libvirt-fedora-31/main.yml 
b/guests/host_vars/libvirt-fedora-31/main.yml
index ade64ed..b884e7f 100644
--- a/guests/host_vars/libvirt-fedora-31/main.yml
+++ b/guests/host_vars/libvirt-fedora-31/main.yml
@@ -22,8 +22,9 @@ os:
   name: 'Fedora'
   version: '31'
 
-package_format: 'rpm'
-package_manager: 'dnf'
+packaging:
+  format: 'rpm'
+  command: 'dnf'
 
 bash: /bin/bash
 cc: /usr/bin/gcc
diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml 
b/guests/host_vars/libvirt-fedora-rawhide/main.yml
index b11e37c..732b988 100644
--- a/guests/host_vars/libvirt-fedora-rawhide/main.yml
+++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml
@@ -22,8 +22,9 @@ os:
   name: 'Fedora'
   version: 'Rawhide'
 
-package_format: 'rpm'
-package_manager: 'dnf'
+packaging:
+  format: 'rpm'
+  command: 'dnf'
 
 bash: /bin/bash
 cc: /usr/bin/gcc
diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml 
b/guests/host_vars/libvirt-freebsd-11/main.yml
index b01c62b..e22b688 100644
--- a/guests/host_vars/libvirt-freebsd-11/main.yml
+++ b