From 6d53a0986332f228d6e5ccaa67c5acd680db5e85 Mon Sep 17 00:00:00 2001 From: Marjan Schiller Date: Fri, 3 May 2013 13:24:55 +0200 Subject: [PATCH] Added parameter for autotest call. --- liveboot_gw_autotest.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/liveboot_gw_autotest.sh b/liveboot_gw_autotest.sh index 1142b52..bfbf451 100755 --- a/liveboot_gw_autotest.sh +++ b/liveboot_gw_autotest.sh @@ -16,6 +16,10 @@ CORE_ROUTER=cr13 GATEWAY=gw1301 PSERVER=pserver1301 +echo "LIVEBOOT_BUILD_NUMBER: ${LIVEBOOT_BUILD_NUMBER}" +echo "AUTOTEST_BRANCH: ${AUTOTEST_BRANCH}" +echo "REPORT_TO_TESTLINK: ${REPORT_TO_TESTLINK}" +echo "AUTOTEST_CONFIG: ${AUTOTEST_CONFIG}" # # prepare ssh # @@ -58,7 +62,7 @@ ssh -t $PSERVER "sudo mount /dev/sda1 -t ext3 /mnt/local_hdd" # ssh -t $CORE_ROUTER "sudo rm /opt/autotest -rf ; sudo mkdir -p /opt/autotest ; sudo chown jenkins /opt/autotest" ssh -t $CORE_ROUTER "cd /opt ; git clone git://git/ri/autotest.git" -ssh -t $CORE_ROUTER "cd /opt/autotest ; git checkout master" +ssh -t $CORE_ROUTER "cd /opt/autotest ; git checkout ${AUTOTEST_BRANCH}" # @@ -66,7 +70,15 @@ ssh -t $CORE_ROUTER "cd /opt/autotest ; git checkout master" # # call autotest suite w/ testlink connector info ssh -t -A $CORE_ROUTER "cd /opt/autotest ; ./compile.sh" -ssh -t -A $CORE_ROUTER "cd /opt/autotest ; java -ea -jar dist/lib/AutoTest.jar --testlink='Profitbricks,R&I Liveboot Approval Autotest,liveboot-${LIVEBOOT_BUILD_NUMBER},R&I HW Test Bed'" + +if [ ${REPORT_TO_TESTLINK} -eq 0 ]; then + echo "Report Results to TestLink..." + ssh -t -A $CORE_ROUTER "cd /opt/autotest ; java -ea -jar dist/lib/AutoTest.jar --testlink='Profitbricks,R&I Liveboot Approval Autotest,liveboot-${LIVEBOOT_BUILD_NUMBER},R&I HW Test Bed'" +else + ssh -t -A $CORE_ROUTER "cd /opt/autotest ; java -ea -jar dist/lib/AutoTest.jar --tracepjds --config=${AUTOTEST_CONFIG}" +fi + + # no testlink support in vcb tests yet ssh -t -A $CORE_ROUTER "cd /opt/autotest ; ./run-compile.sh --vcb=true --tracepjds" -- 2.39.5