[libvirt] [jenkins-ci PATCH 5/5] guests: Move remaining paths out of the inventory

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 <abologna(a)redhat.com&gt; --- 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 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="[\u@\h \w]\$ " -export VIRT_PREFIX="{{ VIRT_PREFIX }}" -export PATH="{{ PATH }}" -export C_INCLUDE_PATH="{{ C_INCLUDE_PATH }}" -export LD_LIBRARY_PATH="{{ LD_LIBRARY_PATH }}" -export PKG_CONFIG_PATH="{{ PKG_CONFIG_PATH }}" -export XDG_DATA_DIRS="{{ XDG_DATA_DIRS }}" -export GI_TYPELIB_PATH="{{ GI_TYPELIB_PATH }}" -export OSINFO_SYSTEM_DIR="{{ OSINFO_SYSTEM_DIR }}" - export MAKE="{{ make }}" export PYTHON="{{ python }}" +export VIRT_PREFIX="$HOME/build/libvirt" +export PATH="$VIRT_PREFIX/bin:$HOME/.ccache/bin:$PATH" +export C_INCLUDE_PATH="$VIRT_PREFIX/include" +export LD_LIBRARY_PATH="$VIRT_PREFIX/lib" +export PKG_CONFIG_PATH="$VIRT_PREFIX/lib/pkgconfig" +export XDG_DATA_DIRS="$VIRT_PREFIX/share:/usr/share:/usr/local/share" +export GI_TYPELIB_PATH="$VIRT_PREFIX/lib/girepository-1.0" +export OSINFO_SYSTEM_DIR="$VIRT_PREFIX/share/osinfo" + # We need to ask Perl for this information, since it's used to # construct installation paths plarch=$(perl -e 'use Config; print $Config{archname}') -- 2.17.0