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 <abologna@redhat.com>
---
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
# 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
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="[\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 }}"
which gmake >/dev/null 2>&1 && export MAKE="gmake" || export MAKE="make"
which ccache >/dev/null 2>&1 && export CC="ccache cc"
--
2.14.3
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list