[libvirt] [jenkins-ci PATCH 11/10] guests: Move $OSINFO_SYSTEM_DIR configuration to shell profile

Andrea Bolognani abologna at redhat.com
Fri Apr 6 11:40:18 UTC 2018


This belongs with all the other enviroment settings, but it was
somehow missed the first time around.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 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:
 
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="{{ 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 PERL5LIB="{{ PERL5LIB }}"
 export PYTHONPATH="{{ PYTHONPATH }}"
 
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=$VIRT_PREFIX/share/osinfo
     jobs:
       - autotools-build-job:
           parent_jobs: 'osinfo-db-master-build'
-- 
2.14.3




More information about the libvir-list mailing list