guests: Improve enviroment handling

[libvirt] [jenkins-ci PATCH 10/10] guests: Remove per-host make variable

Posted by Andrea Bolognani 7 years, 1 month ago

We are figuring out which make binary we should use dynamically
in the shell profile now, so this variable is redundant; plus,
we were not actually using it anywhere.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 guests/group_vars/all/main.yml                    | 1 -
 guests/host_vars/libvirt-freebsd-10/main.yml      | 1 -
 guests/host_vars/libvirt-freebsd-11/main.yml      | 1 -
 guests/host_vars/libvirt-freebsd-current/main.yml | 1 -
 4 files changed, 4 deletions(-)

diff --git a/guests/group_vars/all/main.yml b/guests/group_vars/all/main.yml
index fb83a56..4229e73 100644
--- a/guests/group_vars/all/main.yml
+++ b/guests/group_vars/all/main.yml
@@ -22,6 +22,5 @@ PYTHONPATH:
 
 bash: /bin/bash
 java: /usr/bin/java
-make: /usr/bin/make
 su: /bin/su
 sudoers: /etc/sudoers
diff --git a/guests/host_vars/libvirt-freebsd-10/main.yml b/guests/host_vars/libvirt-freebsd-10/main.yml
index 4d57042..05e1955 100644
--- a/guests/host_vars/libvirt-freebsd-10/main.yml
+++ b/guests/host_vars/libvirt-freebsd-10/main.yml
@@ -6,7 +6,6 @@ PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages
 
 bash: /usr/local/bin/bash
 java: /usr/local/bin/java
-make: /usr/local/bin/gmake
 su: /usr/bin/su
 sudoers: /usr/local/etc/sudoers
 
diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_vars/libvirt-freebsd-11/main.yml
index 4d57042..05e1955 100644
--- a/guests/host_vars/libvirt-freebsd-11/main.yml
+++ b/guests/host_vars/libvirt-freebsd-11/main.yml
@@ -6,7 +6,6 @@ PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages
 
 bash: /usr/local/bin/bash
 java: /usr/local/bin/java
-make: /usr/local/bin/gmake
 su: /usr/bin/su
 sudoers: /usr/local/etc/sudoers
 
diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/host_vars/libvirt-freebsd-current/main.yml
index 4d57042..05e1955 100644
--- a/guests/host_vars/libvirt-freebsd-current/main.yml
+++ b/guests/host_vars/libvirt-freebsd-current/main.yml
@@ -6,7 +6,6 @@ PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages
 
 bash: /usr/local/bin/bash
 java: /usr/local/bin/java
-make: /usr/local/bin/gmake
 su: /usr/bin/su
 sudoers: /usr/local/etc/sudoers
 
-- 
2.14.3

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

Re: [libvirt] [jenkins-ci PATCH 10/10] guests: Remove per-host make variable

Posted by Pavel Hrdina 7 years, 1 month ago

On Thu, Apr 05, 2018 at 02:22:20PM +0200, Andrea Bolognani wrote:
> We are figuring out which make binary we should use dynamically
> in the shell profile now, so this variable is redundant; plus,
> we were not actually using it anywhere.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  guests/group_vars/all/main.yml                    | 1 -
>  guests/host_vars/libvirt-freebsd-10/main.yml      | 1 -
>  guests/host_vars/libvirt-freebsd-11/main.yml      | 1 -
>  guests/host_vars/libvirt-freebsd-current/main.yml | 1 -
>  4 files changed, 4 deletions(-)

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list