[libvirt] [jenkins-ci PATCH 5/3] guests: Fix PERL5LIB for Module::Build

Andrea Bolognani abologna at redhat.com
Wed May 16 11:58:01 UTC 2018


Module::Build uses different paths for installation than
those used by ExtUtils::MakeMaker, so we have to update the
environment accordingly.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 guests/host_vars/libvirt-centos-6/main.yml        | 2 +-
 guests/host_vars/libvirt-centos-7/main.yml        | 2 +-
 guests/host_vars/libvirt-debian-8/main.yml        | 2 +-
 guests/host_vars/libvirt-debian-9/main.yml        | 2 +-
 guests/host_vars/libvirt-debian-sid/main.yml      | 2 +-
 guests/host_vars/libvirt-fedora-27/main.yml       | 2 +-
 guests/host_vars/libvirt-fedora-28/main.yml       | 2 +-
 guests/host_vars/libvirt-fedora-rawhide/main.yml  | 2 +-
 guests/host_vars/libvirt-freebsd-10/main.yml      | 2 +-
 guests/host_vars/libvirt-freebsd-11/main.yml      | 2 +-
 guests/host_vars/libvirt-freebsd-current/main.yml | 2 +-
 guests/host_vars/libvirt-ubuntu-14/main.yml       | 2 +-
 guests/host_vars/libvirt-ubuntu-16/main.yml       | 2 +-
 guests/host_vars/libvirt-ubuntu-18/main.yml       | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/guests/host_vars/libvirt-centos-6/main.yml b/guests/host_vars/libvirt-centos-6/main.yml
index fe9a47b..8b18c19 100644
--- a/guests/host_vars/libvirt-centos-6/main.yml
+++ b/guests/host_vars/libvirt-centos-6/main.yml
@@ -1,5 +1,5 @@
 ---
-PERL5LIB: $VIRT_PREFIX/lib64/perl5
+PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi
 PYTHONPATH: $VIRT_PREFIX/lib64/python2.6/site-packages
 
 projects:
diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml
index 62c929e..8f88615 100644
--- a/guests/host_vars/libvirt-centos-7/main.yml
+++ b/guests/host_vars/libvirt-centos-7/main.yml
@@ -1,5 +1,5 @@
 ---
-PERL5LIB: $VIRT_PREFIX/lib64/perl5
+PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi
 PYTHONPATH: $VIRT_PREFIX/lib64/python2.7/site-packages
 
 projects:
diff --git a/guests/host_vars/libvirt-debian-8/main.yml b/guests/host_vars/libvirt-debian-8/main.yml
index cc91ef0..d0b3601 100644
--- a/guests/host_vars/libvirt-debian-8/main.yml
+++ b/guests/host_vars/libvirt-debian-8/main.yml
@@ -1,5 +1,5 @@
 ---
-PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.20.2
+PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi
 PYTHONPATH: $VIRT_PREFIX/lib/python3.4/site-packages
 
 projects:
diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/libvirt-debian-9/main.yml
index f53ac50..caf513e 100644
--- a/guests/host_vars/libvirt-debian-9/main.yml
+++ b/guests/host_vars/libvirt-debian-9/main.yml
@@ -1,5 +1,5 @@
 ---
-PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.24.1
+PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi
 PYTHONPATH: $VIRT_PREFIX/lib/python3.5/site-packages
 
 projects:
diff --git a/guests/host_vars/libvirt-debian-sid/main.yml b/guests/host_vars/libvirt-debian-sid/main.yml
index bc711f5..88b8b9b 100644
--- a/guests/host_vars/libvirt-debian-sid/main.yml
+++ b/guests/host_vars/libvirt-debian-sid/main.yml
@@ -1,5 +1,5 @@
 ---
-PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.26.2
+PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi
 PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages
 
 projects:
diff --git a/guests/host_vars/libvirt-fedora-27/main.yml b/guests/host_vars/libvirt-fedora-27/main.yml
index 3f69f80..20d90c5 100644
--- a/guests/host_vars/libvirt-fedora-27/main.yml
+++ b/guests/host_vars/libvirt-fedora-27/main.yml
@@ -1,5 +1,5 @@
 ---
-PERL5LIB: $VIRT_PREFIX/lib64/perl5
+PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi
 PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages
 
 projects:
diff --git a/guests/host_vars/libvirt-fedora-28/main.yml b/guests/host_vars/libvirt-fedora-28/main.yml
index 3f69f80..20d90c5 100644
--- a/guests/host_vars/libvirt-fedora-28/main.yml
+++ b/guests/host_vars/libvirt-fedora-28/main.yml
@@ -1,5 +1,5 @@
 ---
-PERL5LIB: $VIRT_PREFIX/lib64/perl5
+PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi
 PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages
 
 projects:
diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml
index 82d46e8..202eccf 100644
--- a/guests/host_vars/libvirt-fedora-rawhide/main.yml
+++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml
@@ -1,5 +1,5 @@
 ---
-PERL5LIB: $VIRT_PREFIX/lib64/perl5
+PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi
 PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages
 
 projects:
diff --git a/guests/host_vars/libvirt-freebsd-10/main.yml b/guests/host_vars/libvirt-freebsd-10/main.yml
index ab5e367..ac5f12b 100644
--- a/guests/host_vars/libvirt-freebsd-10/main.yml
+++ b/guests/host_vars/libvirt-freebsd-10/main.yml
@@ -1,7 +1,7 @@
 ---
 ansible_python_interpreter: /usr/local/bin/python2
 
-PERL5LIB: $VIRT_PREFIX/lib/perl5/site_perl/mach/5.26
+PERL5LIB: $VIRT_PREFIX/lib/perl5/amd64-freebsd-thread-multi
 PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages
 
 projects:
diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_vars/libvirt-freebsd-11/main.yml
index ab5e367..ac5f12b 100644
--- a/guests/host_vars/libvirt-freebsd-11/main.yml
+++ b/guests/host_vars/libvirt-freebsd-11/main.yml
@@ -1,7 +1,7 @@
 ---
 ansible_python_interpreter: /usr/local/bin/python2
 
-PERL5LIB: $VIRT_PREFIX/lib/perl5/site_perl/mach/5.26
+PERL5LIB: $VIRT_PREFIX/lib/perl5/amd64-freebsd-thread-multi
 PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages
 
 projects:
diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/host_vars/libvirt-freebsd-current/main.yml
index ab5e367..ac5f12b 100644
--- a/guests/host_vars/libvirt-freebsd-current/main.yml
+++ b/guests/host_vars/libvirt-freebsd-current/main.yml
@@ -1,7 +1,7 @@
 ---
 ansible_python_interpreter: /usr/local/bin/python2
 
-PERL5LIB: $VIRT_PREFIX/lib/perl5/site_perl/mach/5.26
+PERL5LIB: $VIRT_PREFIX/lib/perl5/amd64-freebsd-thread-multi
 PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages
 
 projects:
diff --git a/guests/host_vars/libvirt-ubuntu-14/main.yml b/guests/host_vars/libvirt-ubuntu-14/main.yml
index 24e079c..fccd0ef 100644
--- a/guests/host_vars/libvirt-ubuntu-14/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-14/main.yml
@@ -1,5 +1,5 @@
 ---
-PERL5LIB: $VIRT_PREFIX/lib/perl/5.18.2
+PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi
 PYTHONPATH: $VIRT_PREFIX/lib/python3.4/site-packages
 
 projects:
diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-16/main.yml
index 0760a0d..caf513e 100644
--- a/guests/host_vars/libvirt-ubuntu-16/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-16/main.yml
@@ -1,5 +1,5 @@
 ---
-PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.22.1
+PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi
 PYTHONPATH: $VIRT_PREFIX/lib/python3.5/site-packages
 
 projects:
diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars/libvirt-ubuntu-18/main.yml
index f5eb52c..88b8b9b 100644
--- a/guests/host_vars/libvirt-ubuntu-18/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-18/main.yml
@@ -1,5 +1,5 @@
 ---
-PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.26.1
+PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi
 PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages
 
 projects:
-- 
2.17.0




More information about the libvir-list mailing list