From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 1 Apr 2015 10:54:47 +0000 (+0100)
Subject: allow instance specific settings
X-Git-Tag: wip.libvirt-v3-base~205^2~7
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6c0e6d64ba417c97dfcd388aaa0d5d62432793ce;p=people%2Fliuw%2Fosstest.git

allow instance specific settings

cri-args-hostlists and invoke-daemon now check for
$HOME/.xen-osstest/settings which can contain things like "export
OSSTEST_CONFIG=production-config-cambridge" to tailor things for a
particular instance of osstest running in production mode.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
[ ijc -- add invoke-daemon too and reword commit message accordingly ]
---

diff --git a/cri-args-hostlists b/cri-args-hostlists
index 04cd6be..08e733d 100644
--- a/cri-args-hostlists
+++ b/cri-args-hostlists
@@ -16,7 +16,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
+if [ -e $HOME/.xen-osstest/settings ]; then
+     source $HOME/.xen-osstest/settings
+fi
 export OSSTEST_CONFIG=${OSSTEST_CONFIG:-production-config}
 
 check_stop_core () {
diff --git a/invoke-daemon b/invoke-daemon
index c1177ca..6006798 100755
--- a/invoke-daemon
+++ b/invoke-daemon
@@ -16,8 +16,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+if [ -e $HOME/.xen-osstest/settings ]; then
+     source $HOME/.xen-osstest/settings
+fi
+export OSSTEST_CONFIG=${OSSTEST_CONFIG:-production-config}
 
-export OSSTEST_CONFIG=production-config
 
 cd "${0%/*}"
 if [ "x$2" != x ]; then sleep $2; fi