[jenkins-ci PATCH v2 4/4] guests: Fix Python installation

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Clean up the mappings to make sure we install the python2 and
python3 packages on FreeBSD instead of python27 and python36,
because the former are the ones that contain the respective
command - which build jobs will invoke. Make the dependency
on the above explicit for the libvirt-python jobs.

Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
 guests/vars/mappings.yml                | 9 +++++++--
 guests/vars/projects/libvirt-python.yml | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index 579deb4..e3781b9 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -550,9 +550,14 @@ mappings:
     pkg: polkit
     rpm: polkit-devel
 
+  python2:
+    default: python
+    Fedora: python2
+    FreeBSD: python2
+
   python2-devel:
     deb: python-dev
-    pkg: python27
+    pkg: python2
     rpm: python2-devel
 
   python2-lxml:
@@ -571,7 +576,7 @@ mappings:
 
   python3-devel:
     deb: python3-dev
-    pkg: python36
+    pkg: python3
     Fedora: python3-devel
 
   python3-gi:
diff --git a/guests/vars/projects/libvirt-python.yml b/guests/vars/projects/libvirt-python.yml
index 72dcb4a..774da26 100644
--- a/guests/vars/projects/libvirt-python.yml
+++ b/guests/vars/projects/libvirt-python.yml
@@ -1,8 +1,10 @@
 ---
 packages:
+  - python2
   - python2-devel
   - python2-lxml
   - python2-nose
+  - python3
   - python3-devel
   - python3-lxml
   - python3-nose
-- 
2.14.3

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux