From nobody Tue Feb 10 00:57:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522930965782454.58095513269006; Thu, 5 Apr 2018 05:22:45 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EDF0CC058EAF; Thu, 5 Apr 2018 12:22:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B8BD87F36F; Thu, 5 Apr 2018 12:22:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6DBC34CAA2; Thu, 5 Apr 2018 12:22:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w35CMTKl025593 for ; Thu, 5 Apr 2018 08:22:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9718A10B00BB; Thu, 5 Apr 2018 12:22:29 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3EDF51208F81 for ; Thu, 5 Apr 2018 12:22:29 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 14:22:15 +0200 Message-Id: <20180405122220.11177-6-abologna@redhat.com> In-Reply-To: <20180405122220.11177-1-abologna@redhat.com> References: <20180405122220.11177-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 05/10] guests: Move make configuration to shell profile X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 05 Apr 2018 12:22:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Pavel Hrdina --- 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=3D"[\u@\h \w]\$ " =20 +which gmake >/dev/null 2>&1 && export MAKE=3D"gmake" || export MAKE=3D"mak= e" which ccache >/dev/null 2>&1 && export CC=3D"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=3D'make' - unamestr=3D`uname` - if [ "$unamestr" =3D 'FreeBSD' ]; then - MAKE=3D'gmake' - fi export PATH=3D$VIRT_PREFIX/bin:$PATH local_env: | smp: 3 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list