From: Marjan Schiller <marjan.schiller@profitbricks.com>
Date: Thu, 13 Jun 2013 15:21:31 +0000 (+0200)
Subject: Fixed test state script.
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=3eb8e70b6c55b8d5141c638ef0f85ab19d12bae7;p=profitbricks%2Fjenkins-build-scripts.git

Fixed test state script.
---

diff --git a/liveboot_set_test_state.sh b/liveboot_set_test_state.sh
index 8a93392..233fc80 100755
--- a/liveboot_set_test_state.sh
+++ b/liveboot_set_test_state.sh
@@ -3,9 +3,9 @@
 
 set -e
 
-if [ -z "${BUILD_NUMBER}" ]
+if [ -z "${LIVEBOOT_BUILD_NUMBER}" ]
 then
-    echo "\$BUILD_NUMBER is empty, not using Jenkins? Please export manually!"
+    echo "\$LIVEBOOT_BUILD_NUMBER is empty, not using Jenkins? Please export manually!"
     exit 1
 fi
 
@@ -19,20 +19,14 @@ fi
 BUILD_SCRIPT=$(mktemp)
 cat > $BUILD_SCRIPT <<-EOF
 cd /srv/build
-rm liveboot_test_state -rf
+rm /srv/build/liveboot_test_state -rf
 git clone git://git/ri/liveboot.git liveboot_test_state
-cd liveboot_test_state
+cd /srv/build/liveboot_test_state/modules
 git checkout $GIT_BRANCH
-./liveboot_test_reporter.py $BUILD_NUMBER $TEST_STATE
+./liveboot_test_reporter.py $LIVEBOOT_BUILD_NUMBER $TEST_STATE
 EOF
 
-set -e
-trap set_failure INT TERM EXIT ERR KILL STOP HUP ABRT PIPE CHLD
-
-echo "sudo pbuilder --execute --bindmounts /srv/build/ -- $BUILD_SCRIPT" > ${BUILD_SCRIPT}_sudo
-bash -x ${BUILD_SCRIPT}_sudo
-rm $BUILD_SCRIPT ${BUILD_SCRIPT}_sudo
+sudo bash -x ${BUILD_SCRIPT}
 
-trap - INT TERM EXIT
+figlet "OK"
 
-figlet "OK"
\ No newline at end of file