From nobody Mon Dec 15 03:19:52 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921633278668.115397497625; Mon, 21 May 2018 09:53:53 -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 D72D5319B48; Mon, 21 May 2018 16:53:51 +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 A375460BEB; Mon, 21 May 2018 16:53:51 +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 61E83180B5AA; Mon, 21 May 2018 16:53:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGrd4m003910 for ; Mon, 21 May 2018 12:53:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 39F9F215CDAA; Mon, 21 May 2018 16:53:39 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A82AE215CDA7 for ; Mon, 21 May 2018 16:53:38 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Mon, 21 May 2018 18:53:27 +0200 Message-Id: <20180521165327.22427-6-abologna@redhat.com> In-Reply-To: <20180521165327.22427-1-abologna@redhat.com> References: <20180521165327.22427-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 5/5] guests: Move remaining paths out of the inventory 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.26]); Mon, 21 May 2018 16:53:52 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" None of these ever needed per-host overrides, so we can avoid one layer of indirection and store them directly in the shell profile. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- guests/group_vars/all/main.yml | 11 ----------- guests/templates/bashrc.j2 | 18 +++++++++--------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/guests/group_vars/all/main.yml b/guests/group_vars/all/main.yml index 2641c33..b73795e 100644 --- a/guests/group_vars/all/main.yml +++ b/guests/group_vars/all/main.yml @@ -5,14 +5,3 @@ ansible_ssh_pass: root =20 jenkins_url: https://ci.centos.org/computer/{{ inventory_hostname }}/slave= -agent.jnlp - -# 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:$HOME/.ccache/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 -OSINFO_SYSTEM_DIR: $VIRT_PREFIX/share/osinfo diff --git a/guests/templates/bashrc.j2 b/guests/templates/bashrc.j2 index a4183ff..7807fc6 100644 --- a/guests/templates/bashrc.j2 +++ b/guests/templates/bashrc.j2 @@ -1,17 +1,17 @@ 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 }}" -export OSINFO_SYSTEM_DIR=3D"{{ OSINFO_SYSTEM_DIR }}" - export MAKE=3D"{{ make }}" export PYTHON=3D"{{ python }}" =20 +export VIRT_PREFIX=3D"$HOME/build/libvirt" +export PATH=3D"$VIRT_PREFIX/bin:$HOME/.ccache/bin:$PATH" +export C_INCLUDE_PATH=3D"$VIRT_PREFIX/include" +export LD_LIBRARY_PATH=3D"$VIRT_PREFIX/lib" +export PKG_CONFIG_PATH=3D"$VIRT_PREFIX/lib/pkgconfig" +export XDG_DATA_DIRS=3D"$VIRT_PREFIX/share:/usr/share:/usr/local/share" +export GI_TYPELIB_PATH=3D"$VIRT_PREFIX/lib/girepository-1.0" +export OSINFO_SYSTEM_DIR=3D"$VIRT_PREFIX/share/osinfo" + # We need to ask Perl for this information, since it's used to # construct installation paths plarch=3D$(perl -e 'use Config; print $Config{archname}') --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list