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

Now that we have our custom shell profile, we can pick the correct make variant dynamically there instead of doing it in the Jenkins job definition, so that the $MAKE variable will also be available when using the guests outside of the CI environment. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- guests/templates/bashrc | 1 + jobs/defaults.yaml | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/guests/templates/bashrc b/guests/templates/bashrc index 51d0e64..6bc0a56 100644 --- a/guests/templates/bashrc +++ b/guests/templates/bashrc @@ -1,3 +1,4 @@ export PS1="[\u@\h \w]\$ " +which gmake >/dev/null 2>&1 && export MAKE="gmake" || export MAKE="make" which ccache >/dev/null 2>&1 && export CC="ccache cc" diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml index cc58314..1eb77d9 100644 --- a/jobs/defaults.yaml +++ b/jobs/defaults.yaml @@ -4,11 +4,6 @@ branch: master node: libvirt global_env: | - MAKE='make' - unamestr=`uname` - if [ "$unamestr" = 'FreeBSD' ]; then - MAKE='gmake' - fi export PATH=$VIRT_PREFIX/bin:$PATH local_env: | smp: 3 -- 2.14.3