COMMANDPATH=$0
COMMAND=$(basename $0)
+# close stdin, as with ubuntu and debian VMs this script tends to hang and wait for input ..
+0<&-
+
# old guests have e.g. mount in /bin but this is no longer part of
# the standard PATH in recent hosts after usrmove, so let's keep it simple
export PATH=$PATH:/bin:/sbin
RUN_LOG_EXTRAS=""
# for publishing results, and the tests settings
-x=$(hostname)
-y=$(hostname|sed -e s,inria,,)
-# INRIA defaults
-if [ "$x" != "$y" ] ; then
- DEFAULT_WEBPATH="/build/@PLDISTRO@/"
- DEFAULT_TESTBUILDURL="http://build.onelab.eu/"
- # this is where the buildurl is pointing towards
- DEFAULT_WEBROOT="/build/"
- DEFAULT_TESTMASTER="testmaster.onelab.eu"
-else
- DEFAULT_WEBPATH="/build/@FCDISTRO@/@PLDISTRO@/"
- DEFAULT_TESTBUILDURL="http://build.planet-lab.org/"
- # this is where the buildurl is pointing towards
- DEFAULT_WEBROOT="/build/"
- DEFAULT_TESTMASTER="manager.test.planet-lab.org"
-fi
+DEFAULT_WEBPATH="/build/@PLDISTRO@/"
+DEFAULT_TESTBUILDURL="http://build.onelab.eu/"
+# this is where the buildurl is pointing towards
+DEFAULT_WEBROOT="/build/"
+DEFAULT_TESTMASTER="testmaster.onelab.eu"
####################
# assuming vm runs in UTC
# temporarily turn off set -e
set +e
- ssh 2>&1 -n ${testmaster_ssh} ${testdir}/run_log --build ${BUILD_SCM_URL} --url ${url} $run_log_env $RUN_LOG_EXTRAS $VERBOSE --all; retcod=$?
- set -e
-
+ ssh 2>&1 ${testmaster_ssh} ${testdir}/run_log --build ${BUILD_SCM_URL} --url ${url} $run_log_env $RUN_LOG_EXTRAS $VERBOSE --all; retcod=$?
+
# interpret retcod of TestMain.py; 2 means there were ignored steps that failed
- echo "received from run_log" $retcod
+ echo "retcod from run_log" $retcod
case $retcod in
0) success=true; IGNORED="" ;;
2) success=true; IGNORED=true ;;
*) success=""; IGNORED="" ;;
esac
+ set -e
# gather logs in the build vm
mkdir -p $(rootdir $BASE)/build/testlogs
rsync --verbose --archive ${testmaster_ssh}:$BASE/logs/ $(rootdir $BASE)/build/testlogs