[libvirt] [jenkins-ci PATCH 2/7] guests: Remove casts for OS details

Andrea Bolognani abologna at redhat.com
Fri Dec 21 08:36:22 UTC 2018


We're always storing os_version as string now, so casting
it before use has become unnecessary.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 guests/lcitool                             | 2 +-
 guests/playbooks/update/tasks/packages.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/guests/lcitool b/guests/lcitool
index f63122d..759eff6 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -498,7 +498,7 @@ class Application:
         facts = self._inventory.get_facts(host)
         package_format = facts["package_format"]
         os_name = facts["os_name"]
-        os_version = str(facts["os_version"])
+        os_version = facts["os_version"]
         os_full = os_name + os_version
 
         if package_format not in ["deb", "rpm"]:
diff --git a/guests/playbooks/update/tasks/packages.yml b/guests/playbooks/update/tasks/packages.yml
index 8cebb5f..7fdfc45 100644
--- a/guests/playbooks/update/tasks/packages.yml
+++ b/guests/playbooks/update/tasks/packages.yml
@@ -46,11 +46,11 @@
 
 - name: '{{ project }}: Look up mappings (OS version)'
   set_fact:
-    temp: '{{ temp|combine({ item: mappings[item][os_name + os_version|string] }) }}'
+    temp: '{{ temp|combine({ item: mappings[item][os_name + os_version] }) }}'
   with_items:
     '{{ packages }}'
   when:
-    - mappings[item][os_name + os_version|string] is defined
+    - mappings[item][os_name + os_version] is defined
 
 - set_fact:
     flattened: []
-- 
2.19.2




More information about the libvir-list mailing list