From nobody Wed May 14 19:45:21 2025 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