[libvirt] [jenkins-ci PATCH 08/10] guests: Move Perl configuration to shell profile

Same as for $VIRT_PREFIX and friends, we want these to be tracked along with the rest of the CI setup instead of being a completely opaque, side-loaded blob. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- guests/group_vars/all/main.yml | 1 + 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-26/main.yml | 2 ++ guests/host_vars/libvirt-fedora-27/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/templates/bashrc | 1 + 15 files changed, 28 insertions(+) diff --git a/guests/group_vars/all/main.yml b/guests/group_vars/all/main.yml index c5166bc..6456bd5 100644 --- a/guests/group_vars/all/main.yml +++ b/guests/group_vars/all/main.yml @@ -17,6 +17,7 @@ LD_LIBRARY_PATH: $VIRT_PREFIX/lib PKG_CONFIG_PATH: $VIRT_PREFIX/lib/pkgconfig XDG_DATA_DIRS: $VIRT_PREFIX/share:/usr/share:/usr/local/share GI_TYPELIB_PATH: $VIRT_PREFIX/lib/girepository-1.0 +PERL5LIB: bash: /bin/bash java: /usr/bin/java diff --git a/guests/host_vars/libvirt-centos-6/main.yml b/guests/host_vars/libvirt-centos-6/main.yml index f7e383d..2265615 100644 --- a/guests/host_vars/libvirt-centos-6/main.yml +++ b/guests/host_vars/libvirt-centos-6/main.yml @@ -1,4 +1,6 @@ --- +PERL5LIB: $VIRT_PREFIX/lib64/perl5 + projects: - libvirt - libvirt-cim diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml index 155da25..3068bb1 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -1,4 +1,6 @@ --- +PERL5LIB: $VIRT_PREFIX/lib64/perl5 + projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-debian-8/main.yml b/guests/host_vars/libvirt-debian-8/main.yml index 43503ce..76c0076 100644 --- a/guests/host_vars/libvirt-debian-8/main.yml +++ b/guests/host_vars/libvirt-debian-8/main.yml @@ -1,4 +1,6 @@ --- +PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.20.2 + projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/libvirt-debian-9/main.yml index cde85bd..45bc9de 100644 --- a/guests/host_vars/libvirt-debian-9/main.yml +++ b/guests/host_vars/libvirt-debian-9/main.yml @@ -1,4 +1,6 @@ --- +PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.24.1 + projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-debian-sid/main.yml b/guests/host_vars/libvirt-debian-sid/main.yml index cde85bd..96b49d2 100644 --- a/guests/host_vars/libvirt-debian-sid/main.yml +++ b/guests/host_vars/libvirt-debian-sid/main.yml @@ -1,4 +1,6 @@ --- +PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.26.1 + projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-fedora-26/main.yml b/guests/host_vars/libvirt-fedora-26/main.yml index 1098d8a..b21e829 100644 --- a/guests/host_vars/libvirt-fedora-26/main.yml +++ b/guests/host_vars/libvirt-fedora-26/main.yml @@ -1,4 +1,6 @@ --- +PERL5LIB: $VIRT_PREFIX/lib64/perl5 + projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-fedora-27/main.yml b/guests/host_vars/libvirt-fedora-27/main.yml index 1098d8a..b21e829 100644 --- a/guests/host_vars/libvirt-fedora-27/main.yml +++ b/guests/host_vars/libvirt-fedora-27/main.yml @@ -1,4 +1,6 @@ --- +PERL5LIB: $VIRT_PREFIX/lib64/perl5 + projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml index 1098d8a..b21e829 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -1,4 +1,6 @@ --- +PERL5LIB: $VIRT_PREFIX/lib64/perl5 + projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-freebsd-10/main.yml b/guests/host_vars/libvirt-freebsd-10/main.yml index 2f7bced..dc1a018 100644 --- a/guests/host_vars/libvirt-freebsd-10/main.yml +++ b/guests/host_vars/libvirt-freebsd-10/main.yml @@ -1,6 +1,8 @@ --- ansible_python_interpreter: /usr/local/bin/python2 +PERL5LIB: $VIRT_PREFIX/lib/perl5/site_perl/mach/5.26 + bash: /usr/local/bin/bash java: /usr/local/bin/java make: /usr/local/bin/gmake diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_vars/libvirt-freebsd-11/main.yml index 2f7bced..dc1a018 100644 --- a/guests/host_vars/libvirt-freebsd-11/main.yml +++ b/guests/host_vars/libvirt-freebsd-11/main.yml @@ -1,6 +1,8 @@ --- ansible_python_interpreter: /usr/local/bin/python2 +PERL5LIB: $VIRT_PREFIX/lib/perl5/site_perl/mach/5.26 + bash: /usr/local/bin/bash java: /usr/local/bin/java make: /usr/local/bin/gmake diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/host_vars/libvirt-freebsd-current/main.yml index 2f7bced..dc1a018 100644 --- a/guests/host_vars/libvirt-freebsd-current/main.yml +++ b/guests/host_vars/libvirt-freebsd-current/main.yml @@ -1,6 +1,8 @@ --- ansible_python_interpreter: /usr/local/bin/python2 +PERL5LIB: $VIRT_PREFIX/lib/perl5/site_perl/mach/5.26 + bash: /usr/local/bin/bash java: /usr/local/bin/java make: /usr/local/bin/gmake diff --git a/guests/host_vars/libvirt-ubuntu-14/main.yml b/guests/host_vars/libvirt-ubuntu-14/main.yml index 4a58ee7..a4e8849 100644 --- a/guests/host_vars/libvirt-ubuntu-14/main.yml +++ b/guests/host_vars/libvirt-ubuntu-14/main.yml @@ -1,4 +1,6 @@ --- +PERL5LIB: $VIRT_PREFIX/lib/perl/5.18.2 + projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-16/main.yml index 9794467..34c5a87 100644 --- a/guests/host_vars/libvirt-ubuntu-16/main.yml +++ b/guests/host_vars/libvirt-ubuntu-16/main.yml @@ -1,4 +1,6 @@ --- +PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.22.1 + projects: - libosinfo - libvirt diff --git a/guests/templates/bashrc b/guests/templates/bashrc index 721272a..a508910 100644 --- a/guests/templates/bashrc +++ b/guests/templates/bashrc @@ -7,6 +7,7 @@ export LD_LIBRARY_PATH="{{ LD_LIBRARY_PATH }}" export PKG_CONFIG_PATH="{{ PKG_CONFIG_PATH }}" export XDG_DATA_DIRS="{{ XDG_DATA_DIRS }}" export GI_TYPELIB_PATH="{{ GI_TYPELIB_PATH }}" +export PERL5LIB="{{ PERL5LIB }}" which gmake >/dev/null 2>&1 && export MAKE="gmake" || export MAKE="make" which ccache >/dev/null 2>&1 && export CC="ccache cc" -- 2.14.3