From nobody Sat May 4 04:42:59 2024 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 1522930951204359.84867421066974; Thu, 5 Apr 2018 05:22:31 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BF6C2BB9C5; Thu, 5 Apr 2018 12:22:29 +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 8E3A36A25E; Thu, 5 Apr 2018 12:22:29 +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 0726A4CA97; Thu, 5 Apr 2018 12:22:29 +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 w35CMRGj025560 for ; Thu, 5 Apr 2018 08:22:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3AE011208F81; Thu, 5 Apr 2018 12:22:27 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D616810B00BB for ; Thu, 5 Apr 2018 12:22:26 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 14:22:11 +0200 Message-Id: <20180405122220.11177-2-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 01/10] guests: Rename compat -> kludges 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 05 Apr 2018 12:22:30 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This task only contains workarounds that we shouldn't have to worry about to begin with, and that hopefully in due time we'll be able to drop entirely. Rename it to make this more apparent. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- guests/site.yml | 2 +- guests/tasks/{compat.yml =3D> kludges.yml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename guests/tasks/{compat.yml =3D> kludges.yml} (100%) diff --git a/guests/site.yml b/guests/site.yml index 869291d..26127be 100644 --- a/guests/site.yml +++ b/guests/site.yml @@ -32,7 +32,7 @@ # Configure environment. Needs to happen after installing base packages - include: tasks/bootloader.yml - include: tasks/services.yml - - include: tasks/compat.yml + - include: tasks/kludges.yml - include: tasks/users.yml =20 # Install build dependencies for each project diff --git a/guests/tasks/compat.yml b/guests/tasks/kludges.yml similarity index 100% rename from guests/tasks/compat.yml rename to guests/tasks/kludges.yml --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 04:42:59 2024 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 1522930952622807.5922116839383; Thu, 5 Apr 2018 05:22:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EF800C057F85; Thu, 5 Apr 2018 12:22:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C667217D7D; Thu, 5 Apr 2018 12:22:30 +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 6517F1800C9F; Thu, 5 Apr 2018 12:22:30 +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 w35CMRWB025571 for ; Thu, 5 Apr 2018 08:22:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id CBEB31208F81; Thu, 5 Apr 2018 12:22:27 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7383C10B00BB for ; Thu, 5 Apr 2018 12:22:27 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 14:22:12 +0200 Message-Id: <20180405122220.11177-3-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 02/10] guests: Enable ~/.bashrc on FreeBSD 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.14 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:31 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Due to the way bash is compiled on FreeBSD, we need to flip an extra switch in order to convince it to process the shell profile even when we're running commands non-interactively through ssh. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- guests/tasks/kludges.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/guests/tasks/kludges.yml b/guests/tasks/kludges.yml index 001b5c6..0196559 100644 --- a/guests/tasks/kludges.yml +++ b/guests/tasks/kludges.yml @@ -29,3 +29,21 @@ when: - os_name =3D=3D 'FreeBSD' - os_version =3D=3D '11' + +# FreeBSD compiles bash without defining SSH_SOURCE_BASHRC, which means +# it won't try to detect when it's spawned by ssh and source ~/.bashrc +# when that's the case. Our workaround is setting $BASH_ENV globally +- name: Enable ~/.bashrc + replace: + path: /etc/login.conf + regexp: '^(.*):setenv=3D(BASH_ENV=3D[^,]*,)?(.*):\\$' + replace: '\1:setenv=3DBASH_ENV=3D~/.bashrc,\3:\\' + validate: 'cap_mkdb %s' + register: loginconf + when: + - os_name =3D=3D 'FreeBSD' + +- name: Enable ~/.bashrc + command: cap_mkdb /etc/login.conf + when: + - loginconf.changed --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 04:42:59 2024 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 1522930965230160.25287851764097; Thu, 5 Apr 2018 05:22:45 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ECDADBB9C6; 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 BE8A217D7D; 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 6DB694CAA1; 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 w35CMSfO025576 for ; Thu, 5 Apr 2018 08:22:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 68BE010B00BB; Thu, 5 Apr 2018 12:22:28 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1064B1208F87 for ; Thu, 5 Apr 2018 12:22:27 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 14:22:13 +0200 Message-Id: <20180405122220.11177-4-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 03/10] guests: Add custom 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 05 Apr 2018 12:22:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We want to take control of the user's environment. For now the custom shell profile only sets the prompt, but it will later be used to influence the build environment. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- guests/tasks/users.yml | 17 +++++++++++++++++ guests/templates/bash_profile | 1 + guests/templates/bashrc | 1 + 3 files changed, 19 insertions(+) create mode 100644 guests/templates/bash_profile create mode 100644 guests/templates/bashrc diff --git a/guests/tasks/users.yml b/guests/tasks/users.yml index 1ecacee..8e59fa9 100644 --- a/guests/tasks/users.yml +++ b/guests/tasks/users.yml @@ -82,3 +82,20 @@ owner: '{{ flavor }}' group: '{{ flavor }}' create: yes + +- name: '{{ flavor }}: Create shell profile' + template: + src: templates/{{ item }} + dest: /home/{{ flavor }}/.{{ item }} + owner: '{{ flavor }}' + group: '{{ flavor }}' + with_items: + - bash_profile + - bashrc + +- name: '{{ flavor }}: Remove existing shell profile' + file: + path: /home/{{ flavor }}/.{{ item }} + state: absent + with_items: + - profile diff --git a/guests/templates/bash_profile b/guests/templates/bash_profile new file mode 100644 index 0000000..a82a60e --- /dev/null +++ b/guests/templates/bash_profile @@ -0,0 +1 @@ +test -f ~/.bashrc && . ~/.bashrc diff --git a/guests/templates/bashrc b/guests/templates/bashrc new file mode 100644 index 0000000..6640da6 --- /dev/null +++ b/guests/templates/bashrc @@ -0,0 +1 @@ +export PS1=3D"[\u@\h \w]\$ " --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 04:42:59 2024 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 1522930965603987.1384367072416; Thu, 5 Apr 2018 05:22:45 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 04FCC356DE; Thu, 5 Apr 2018 12:22:41 +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 BC40A89E61; 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 68C174CAA0; 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 w35CMTjL025585 for ; Thu, 5 Apr 2018 08:22:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 064E110B00BB; 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 A192B1208F81 for ; Thu, 5 Apr 2018 12:22:28 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 14:22:14 +0200 Message-Id: <20180405122220.11177-5-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 04/10] guests: Move ccache 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); 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, making sure ccache is used is way simpler. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- guests/tasks/users.yml | 18 ------------------ guests/templates/bashrc | 2 ++ 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/guests/tasks/users.yml b/guests/tasks/users.yml index 8e59fa9..e691b32 100644 --- a/guests/tasks/users.yml +++ b/guests/tasks/users.yml @@ -65,24 +65,6 @@ owner: '{{ flavor }}' group: '{{ flavor }}' =20 -- name: '{{ flavor }}: Enable ccache' - lineinfile: - path: /home/{{ flavor }}/.profile - line: 'which ccache >/dev/null 2>&1 && export CC=3D"ccache cc"' - state: present - owner: '{{ flavor }}' - group: '{{ flavor }}' - create: yes - -- name: '{{ flavor }}: Enable ccache' - lineinfile: - path: /home/{{ flavor }}/.bashrc - line: 'which ccache >/dev/null 2>&1 && export CC=3D"ccache cc"' - state: present - owner: '{{ flavor }}' - group: '{{ flavor }}' - create: yes - - name: '{{ flavor }}: Create shell profile' template: src: templates/{{ item }} diff --git a/guests/templates/bashrc b/guests/templates/bashrc index 6640da6..51d0e64 100644 --- a/guests/templates/bashrc +++ b/guests/templates/bashrc @@ -1 +1,3 @@ export PS1=3D"[\u@\h \w]\$ " + +which ccache >/dev/null 2>&1 && export CC=3D"ccache cc" --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 04:42:59 2024 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 From nobody Sat May 4 04:42:59 2024 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 1522930966165993.0151199208622; Thu, 5 Apr 2018 05:22:46 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C15084903F; Thu, 5 Apr 2018 12:22:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7C0EA18B08; Thu, 5 Apr 2018 12:22:44 +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 1948E180BAD4; Thu, 5 Apr 2018 12:22:44 +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 w35CMUCD025598 for ; Thu, 5 Apr 2018 08:22:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 349CB10B00BB; Thu, 5 Apr 2018 12:22:30 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D022B1208F81 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:16 +0200 Message-Id: <20180405122220.11177-7-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 06/10] guests: Move $PATH 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 05 Apr 2018 12:22:45 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Same as for $MAKE, moving the configuration here makes it easier to reproduce issues outside of the CI environment. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- guests/group_vars/all/main.yml | 6 ++++-- guests/templates/bashrc | 2 ++ jobs/defaults.yaml | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/guests/group_vars/all/main.yml b/guests/group_vars/all/main.yml index dbe9517..ee53eec 100644 --- a/guests/group_vars/all/main.yml +++ b/guests/group_vars/all/main.yml @@ -8,8 +8,10 @@ ansible_ssh_pass: root =20 jenkins_url: https://ci.centos.org/computer/{{ inventory_hostname }}/slave= -agent.jnlp =20 -# Paths to various commands and files that might be OS-dependent. Can -# be overridden on a per-host basis +# Environment variables and paths to commands/files that might be +# OS-dependent. Can be overridden on a per-host basis +PATH: $VIRT_PREFIX/bin:$PATH + bash: /bin/bash java: /usr/bin/java make: /usr/bin/make diff --git a/guests/templates/bashrc b/guests/templates/bashrc index 6bc0a56..affdf4c 100644 --- a/guests/templates/bashrc +++ b/guests/templates/bashrc @@ -1,4 +1,6 @@ export PS1=3D"[\u@\h \w]\$ " =20 +export PATH=3D"{{ PATH }}" + 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 1eb77d9..23f8555 100644 --- a/jobs/defaults.yaml +++ b/jobs/defaults.yaml @@ -4,7 +4,6 @@ branch: master node: libvirt global_env: | - export PATH=3D$VIRT_PREFIX/bin:$PATH local_env: | smp: 3 spam: ymankad@redhat.com libvirt-ci@redhat.com --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 04:42:59 2024 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 1522930966162845.3948368839774; Thu, 5 Apr 2018 05:22:46 -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 C2CDABB9D9; Thu, 5 Apr 2018 12:22:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7CCC97F36F; Thu, 5 Apr 2018 12:22:44 +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 1B6DA180BAD5; Thu, 5 Apr 2018 12:22:44 +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 w35CMU2v025611 for ; Thu, 5 Apr 2018 08:22:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id C625210B00BB; Thu, 5 Apr 2018 12:22:30 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6D7D31208F87 for ; Thu, 5 Apr 2018 12:22:30 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 14:22:17 +0200 Message-Id: <20180405122220.11177-8-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 07/10] guests: Add more enviroment variables 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.26]); Thu, 05 Apr 2018 12:22:45 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" All these are currently defined per-worker at the Jenkins level, which has several disadvantages: first of all, they are completely invisible to anyone except people with admin access to the Jenkins instance; moreover, updating them requires a lot of clicking in the web interface, and change history is not tracked. Moving their configuration to the shell profile solves all those issues. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- guests/group_vars/all/main.yml | 6 ++++++ guests/templates/bashrc | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/guests/group_vars/all/main.yml b/guests/group_vars/all/main.yml index ee53eec..c5166bc 100644 --- a/guests/group_vars/all/main.yml +++ b/guests/group_vars/all/main.yml @@ -10,7 +10,13 @@ jenkins_url: https://ci.centos.org/computer/{{ inventory= _hostname }}/slave-agent =20 # Environment variables and paths to commands/files that might be # OS-dependent. Can be overridden on a per-host basis +VIRT_PREFIX: $HOME/build/libvirt PATH: $VIRT_PREFIX/bin:$PATH +C_INCLUDE_PATH: $VIRT_PREFIX/include +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 =20 bash: /bin/bash java: /usr/bin/java diff --git a/guests/templates/bashrc b/guests/templates/bashrc index affdf4c..721272a 100644 --- a/guests/templates/bashrc +++ b/guests/templates/bashrc @@ -1,6 +1,12 @@ export PS1=3D"[\u@\h \w]\$ " =20 +export VIRT_PREFIX=3D"{{ VIRT_PREFIX }}" export PATH=3D"{{ PATH }}" +export C_INCLUDE_PATH=3D"{{ C_INCLUDE_PATH }}" +export LD_LIBRARY_PATH=3D"{{ LD_LIBRARY_PATH }}" +export PKG_CONFIG_PATH=3D"{{ PKG_CONFIG_PATH }}" +export XDG_DATA_DIRS=3D"{{ XDG_DATA_DIRS }}" +export GI_TYPELIB_PATH=3D"{{ GI_TYPELIB_PATH }}" =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" --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 04:42:59 2024 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 1522930970530359.17354893384413; Thu, 5 Apr 2018 05:22:50 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 304D880479; Thu, 5 Apr 2018 12:22:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0001E18675; Thu, 5 Apr 2018 12:22:48 +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 9EF0B180BAE5; Thu, 5 Apr 2018 12:22:48 +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 w35CMVpl025621 for ; Thu, 5 Apr 2018 08:22:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 63A0310B00BB; Thu, 5 Apr 2018 12:22:31 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0AD871208F81 for ; Thu, 5 Apr 2018 12:22:30 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 14:22:18 +0200 Message-Id: <20180405122220.11177-9-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 08/10] guests: Move Perl 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 05 Apr 2018 12:22:49 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Pavel Hrdina --- 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: =20 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_var= s/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_var= s/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 =20 +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_var= s/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 =20 +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/hos= t_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 =20 +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=3D"{{ LD_LIBRARY_PATH }}" export PKG_CONFIG_PATH=3D"{{ PKG_CONFIG_PATH }}" export XDG_DATA_DIRS=3D"{{ XDG_DATA_DIRS }}" export GI_TYPELIB_PATH=3D"{{ GI_TYPELIB_PATH }}" +export PERL5LIB=3D"{{ PERL5LIB }}" =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" --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 04:42:59 2024 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 15229309711801011.6965379913844; Thu, 5 Apr 2018 05:22:51 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 37B398047A; Thu, 5 Apr 2018 12:22:49 +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 EDD996C32A; Thu, 5 Apr 2018 12:22:48 +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 AA0A74CAA4; Thu, 5 Apr 2018 12:22:48 +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 w35CMWTv025628 for ; Thu, 5 Apr 2018 08:22:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0094A10B00BB; Thu, 5 Apr 2018 12:22:32 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C6371208F81 for ; Thu, 5 Apr 2018 12:22:31 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 14:22:19 +0200 Message-Id: <20180405122220.11177-10-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 09/10] guests: Add Python 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 05 Apr 2018 12:22:49 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This is conceptually identical to how Perl is handled, except that we still need to override $PYTHONPATH in Jenkins jobs in order to be able to build projects using both Python 3 and Python 2 on the same guest. We might want to reconsider that decision, but for the time being this change is still helpful to people running guests outside of the CI environment. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- guests/group_vars/all/main.yml | 1 + guests/host_vars/libvirt-centos-6/main.yml | 1 + guests/host_vars/libvirt-centos-7/main.yml | 1 + guests/host_vars/libvirt-debian-8/main.yml | 1 + guests/host_vars/libvirt-debian-9/main.yml | 1 + guests/host_vars/libvirt-debian-sid/main.yml | 1 + guests/host_vars/libvirt-fedora-26/main.yml | 1 + guests/host_vars/libvirt-fedora-27/main.yml | 1 + guests/host_vars/libvirt-fedora-rawhide/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 + guests/host_vars/libvirt-ubuntu-14/main.yml | 1 + guests/host_vars/libvirt-ubuntu-16/main.yml | 1 + guests/templates/bashrc | 2 ++ 15 files changed, 16 insertions(+) diff --git a/guests/group_vars/all/main.yml b/guests/group_vars/all/main.yml index 6456bd5..fb83a56 100644 --- a/guests/group_vars/all/main.yml +++ b/guests/group_vars/all/main.yml @@ -18,6 +18,7 @@ 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: +PYTHONPATH: =20 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 2265615..422d033 100644 --- a/guests/host_vars/libvirt-centos-6/main.yml +++ b/guests/host_vars/libvirt-centos-6/main.yml @@ -1,5 +1,6 @@ --- PERL5LIB: $VIRT_PREFIX/lib64/perl5 +PYTHONPATH: $VIRT_PREFIX/lib64/python2.6/site-packages =20 projects: - libvirt diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/= libvirt-centos-7/main.yml index 3068bb1..935ab15 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -1,5 +1,6 @@ --- PERL5LIB: $VIRT_PREFIX/lib64/perl5 +PYTHONPATH: $VIRT_PREFIX/lib64/python2.7/site-packages =20 projects: - libosinfo diff --git a/guests/host_vars/libvirt-debian-8/main.yml b/guests/host_vars/= libvirt-debian-8/main.yml index 76c0076..bfd074d 100644 --- a/guests/host_vars/libvirt-debian-8/main.yml +++ b/guests/host_vars/libvirt-debian-8/main.yml @@ -1,5 +1,6 @@ --- PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.20.2 +PYTHONPATH: $VIRT_PREFIX/lib/python3.4/site-packages =20 projects: - libosinfo diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/= libvirt-debian-9/main.yml index 45bc9de..bdaa00d 100644 --- a/guests/host_vars/libvirt-debian-9/main.yml +++ b/guests/host_vars/libvirt-debian-9/main.yml @@ -1,5 +1,6 @@ --- PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.24.1 +PYTHONPATH: $VIRT_PREFIX/lib/python3.5/site-packages =20 projects: - libosinfo diff --git a/guests/host_vars/libvirt-debian-sid/main.yml b/guests/host_var= s/libvirt-debian-sid/main.yml index 96b49d2..cb61b6e 100644 --- a/guests/host_vars/libvirt-debian-sid/main.yml +++ b/guests/host_vars/libvirt-debian-sid/main.yml @@ -1,5 +1,6 @@ --- PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.26.1 +PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages =20 projects: - libosinfo diff --git a/guests/host_vars/libvirt-fedora-26/main.yml b/guests/host_vars= /libvirt-fedora-26/main.yml index b21e829..732df24 100644 --- a/guests/host_vars/libvirt-fedora-26/main.yml +++ b/guests/host_vars/libvirt-fedora-26/main.yml @@ -1,5 +1,6 @@ --- PERL5LIB: $VIRT_PREFIX/lib64/perl5 +PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages =20 projects: - libosinfo diff --git a/guests/host_vars/libvirt-fedora-27/main.yml b/guests/host_vars= /libvirt-fedora-27/main.yml index b21e829..732df24 100644 --- a/guests/host_vars/libvirt-fedora-27/main.yml +++ b/guests/host_vars/libvirt-fedora-27/main.yml @@ -1,5 +1,6 @@ --- PERL5LIB: $VIRT_PREFIX/lib64/perl5 +PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages =20 projects: - libosinfo diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host= _vars/libvirt-fedora-rawhide/main.yml index b21e829..732df24 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -1,5 +1,6 @@ --- PERL5LIB: $VIRT_PREFIX/lib64/perl5 +PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages =20 projects: - libosinfo diff --git a/guests/host_vars/libvirt-freebsd-10/main.yml b/guests/host_var= s/libvirt-freebsd-10/main.yml index dc1a018..4d57042 100644 --- a/guests/host_vars/libvirt-freebsd-10/main.yml +++ b/guests/host_vars/libvirt-freebsd-10/main.yml @@ -2,6 +2,7 @@ ansible_python_interpreter: /usr/local/bin/python2 =20 PERL5LIB: $VIRT_PREFIX/lib/perl5/site_perl/mach/5.26 +PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages =20 bash: /usr/local/bin/bash java: /usr/local/bin/java diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_var= s/libvirt-freebsd-11/main.yml index dc1a018..4d57042 100644 --- a/guests/host_vars/libvirt-freebsd-11/main.yml +++ b/guests/host_vars/libvirt-freebsd-11/main.yml @@ -2,6 +2,7 @@ ansible_python_interpreter: /usr/local/bin/python2 =20 PERL5LIB: $VIRT_PREFIX/lib/perl5/site_perl/mach/5.26 +PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages =20 bash: /usr/local/bin/bash java: /usr/local/bin/java diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/hos= t_vars/libvirt-freebsd-current/main.yml index dc1a018..4d57042 100644 --- a/guests/host_vars/libvirt-freebsd-current/main.yml +++ b/guests/host_vars/libvirt-freebsd-current/main.yml @@ -2,6 +2,7 @@ ansible_python_interpreter: /usr/local/bin/python2 =20 PERL5LIB: $VIRT_PREFIX/lib/perl5/site_perl/mach/5.26 +PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages =20 bash: /usr/local/bin/bash java: /usr/local/bin/java diff --git a/guests/host_vars/libvirt-ubuntu-14/main.yml b/guests/host_vars= /libvirt-ubuntu-14/main.yml index a4e8849..b404a5a 100644 --- a/guests/host_vars/libvirt-ubuntu-14/main.yml +++ b/guests/host_vars/libvirt-ubuntu-14/main.yml @@ -1,5 +1,6 @@ --- PERL5LIB: $VIRT_PREFIX/lib/perl/5.18.2 +PYTHONPATH: $VIRT_PREFIX/lib/python3.4/site-packages =20 projects: - libosinfo diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars= /libvirt-ubuntu-16/main.yml index 34c5a87..7991608 100644 --- a/guests/host_vars/libvirt-ubuntu-16/main.yml +++ b/guests/host_vars/libvirt-ubuntu-16/main.yml @@ -1,5 +1,6 @@ --- PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.22.1 +PYTHONPATH: $VIRT_PREFIX/lib/python3.5/site-packages =20 projects: - libosinfo diff --git a/guests/templates/bashrc b/guests/templates/bashrc index a508910..95bb172 100644 --- a/guests/templates/bashrc +++ b/guests/templates/bashrc @@ -8,6 +8,8 @@ export PKG_CONFIG_PATH=3D"{{ PKG_CONFIG_PATH }}" export XDG_DATA_DIRS=3D"{{ XDG_DATA_DIRS }}" export GI_TYPELIB_PATH=3D"{{ GI_TYPELIB_PATH }}" export PERL5LIB=3D"{{ PERL5LIB }}" +export PYTHONPATH=3D"{{ PYTHONPATH }}" =20 +which python3 >/dev/null 2>&1 && export PYTHON=3D"python3" || export PYTHO= N=3D"python2" 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" --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 04:42:59 2024 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 1522930974963352.4699275900899; Thu, 5 Apr 2018 05:22:54 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 49E3119CBF6; Thu, 5 Apr 2018 12:22:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 174A57D66D; Thu, 5 Apr 2018 12:22:53 +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 B51F4180215E; Thu, 5 Apr 2018 12:22:52 +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 w35CMWsT025645 for ; Thu, 5 Apr 2018 08:22:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 91FF010B00BB; Thu, 5 Apr 2018 12:22:32 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 398451208F81 for ; Thu, 5 Apr 2018 12:22:32 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 14:22:20 +0200 Message-Id: <20180405122220.11177-11-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 10/10] guests: Remove per-host make variable 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 05 Apr 2018 12:22:53 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Pavel Hrdina --- 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: =20 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_var= s/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 =20 bash: /usr/local/bin/bash java: /usr/local/bin/java -make: /usr/local/bin/gmake su: /usr/bin/su sudoers: /usr/local/etc/sudoers =20 diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_var= s/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 =20 bash: /usr/local/bin/bash java: /usr/local/bin/java -make: /usr/local/bin/gmake su: /usr/bin/su sudoers: /usr/local/etc/sudoers =20 diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/hos= t_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 =20 bash: /usr/local/bin/bash java: /usr/local/bin/java -make: /usr/local/bin/gmake su: /usr/bin/su sudoers: /usr/local/etc/sudoers =20 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 04:42:59 2024 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 1523014837353701.9993497437957; Fri, 6 Apr 2018 04:40:37 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EABCC8535D; Fri, 6 Apr 2018 11:40:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AD8EE705B1; Fri, 6 Apr 2018 11:40:35 +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 662831800CA2; Fri, 6 Apr 2018 11:40:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w36BeYYR032485 for ; Fri, 6 Apr 2018 07:40:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1A2C4AFD6D; Fri, 6 Apr 2018 11:40:34 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AC835AFD4C for ; Fri, 6 Apr 2018 11:40:31 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 6 Apr 2018 13:40:18 +0200 Message-Id: <20180406114018.24436-1-abologna@redhat.com> In-Reply-To: <20180405122220.11177-1-abologna@redhat.com> References: <20180405122220.11177-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 11/10] guests: Move $OSINFO_SYSTEM_DIR 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 06 Apr 2018 11:40:36 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This belongs with all the other enviroment settings, but it was somehow missed the first time around. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- guests/group_vars/all/main.yml | 1 + guests/templates/bashrc | 1 + projects/libosinfo.yaml | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/guests/group_vars/all/main.yml b/guests/group_vars/all/main.yml index 4229e73..2bdb7b3 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 +OSINFO_SYSTEM_DIR: $VIRT_PREFIX/share/osinfo PERL5LIB: PYTHONPATH: =20 diff --git a/guests/templates/bashrc b/guests/templates/bashrc index 95bb172..639a961 100644 --- a/guests/templates/bashrc +++ b/guests/templates/bashrc @@ -7,6 +7,7 @@ export LD_LIBRARY_PATH=3D"{{ LD_LIBRARY_PATH }}" export PKG_CONFIG_PATH=3D"{{ PKG_CONFIG_PATH }}" export XDG_DATA_DIRS=3D"{{ XDG_DATA_DIRS }}" export GI_TYPELIB_PATH=3D"{{ GI_TYPELIB_PATH }}" +export OSINFO_SYSTEM_DIR=3D"{{ OSINFO_SYSTEM_DIR }}" export PERL5LIB=3D"{{ PERL5LIB }}" export PYTHONPATH=3D"{{ PYTHONPATH }}" =20 diff --git a/projects/libosinfo.yaml b/projects/libosinfo.yaml index efe66c9..ac04027 100644 --- a/projects/libosinfo.yaml +++ b/projects/libosinfo.yaml @@ -11,8 +11,6 @@ - libvirt-freebsd-10 - libvirt-freebsd-11 title: libosinfo - local_env: | - export OSINFO_SYSTEM_DIR=3D$VIRT_PREFIX/share/osinfo jobs: - autotools-build-job: parent_jobs: 'osinfo-db-master-build' --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 04:42:59 2024 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 1523028171568104.47720171949891; Fri, 6 Apr 2018 08:22:51 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 37B0FC070E17; Fri, 6 Apr 2018 15:22:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 029B0182C0; Fri, 6 Apr 2018 15:22:50 +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 A31B81800CA2; Fri, 6 Apr 2018 15:22:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w36FMm4S020233 for ; Fri, 6 Apr 2018 11:22:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 63D2F2023235; Fri, 6 Apr 2018 15:22:48 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 025DE2023227 for ; Fri, 6 Apr 2018 15:22:47 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 6 Apr 2018 17:22:37 +0200 Message-Id: <20180406152237.8114-1-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.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 12/10] guests: Enable bash completion by default 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 06 Apr 2018 15:22:50 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" In order for bash completion to be available right after login we need to make sure the corresponding package is installed and, for FreeBSD only, the enviroment script gets sourced. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- guests/templates/bashrc | 5 +++++ guests/vars/projects/base.yml | 1 + guests/vars/projects/libvirt.yml | 1 - 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/guests/templates/bashrc b/guests/templates/bashrc index 639a961..e925cd9 100644 --- a/guests/templates/bashrc +++ b/guests/templates/bashrc @@ -14,3 +14,8 @@ export PYTHONPATH=3D"{{ PYTHONPATH }}" which python3 >/dev/null 2>&1 && export PYTHON=3D"python3" || export PYTHO= N=3D"python2" 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" + +# Enable bash completion. Only needed on FreeBSD, the system-wide +# shell profile will take care of it for us everywhere else +bash_completion=3D/usr/local/share/bash-completion/bash_completion.sh +test -f "$bash_completion" && . "$bash_completion" diff --git a/guests/vars/projects/base.yml b/guests/vars/projects/base.yml index a0483d8..49d4d2e 100644 --- a/guests/vars/projects/base.yml +++ b/guests/vars/projects/base.yml @@ -4,6 +4,7 @@ packages: - automake - autopoint - bash + - bash-completion - ccache - chrony - cppi diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvir= t.yml index 9f027f8..598dfc4 100644 --- a/guests/vars/projects/libvirt.yml +++ b/guests/vars/projects/libvirt.yml @@ -3,7 +3,6 @@ packages: - apparmor - augeas - avahi - - bash-completion - cyrus-sasl - device-mapper - dnsmasq --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list