X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Finclude-raw-integration-deploy-controller-run-test.sh;h=fc5f6d7c7223f8c47f78ab0dc838cf6ca016a74a;hb=bf79da9c57ab3f3eebd3760aebcbe273d5b7173c;hp=f9831de43c8fe10dd8cb3ede55ef3083f55a3d1c;hpb=9c10d1f940554135e1b1ebcd5d35457258d9ec1c;p=releng%2Fbuilder.git

diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index f9831de43..fc5f6d7c7 100644
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -5,9 +5,6 @@ DISTRIBUTION="karaf"
 if [ ${CONTROLLERSCOPE} == 'all' ]; then
     CONTROLLERFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
     CONTROLLERMEM="3072m"
-    if [ ${BRANCH} == 'master' ]; then
-        DISTRIBUTION="test"
-    fi
 fi
 
 if [ ${BUNDLEURL} == 'last' ]; then
@@ -40,7 +37,8 @@ echo "Configuring the startup features..."
 cd ${BUNDLEFOLDER}/etc
 CFG=org.apache.karaf.features.cfg
 cp \${CFG} \${CFG}.bak
-cat \${CFG}.bak | sed "s/^featuresBoot=.*/featuresBoot=config,standard,region,package,kar,ssh,management,${CONTROLLERFEATURES}/" > \${CFG}
+cat \${CFG}.bak | sed "s/^featuresBoot=.*/featuresBoot=config,standard,region,package,kar,ssh,management,${CONTROLLERFEATURES}/" > \${CFG}.1
+cat \${CFG}.1 | sed "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%" > \${CFG}
 cat \${CFG}
 
 echo "Configuring the log..."
@@ -69,7 +67,9 @@ while true; do
         break
     elif (( "\$COUNT" > "600" )); then
         echo Timeout Controller DOWN
-        break
+        echo "Fetching Karaf log"
+        scp ${CONTROLLER0}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log .
+        exit 1
     else
         COUNT=\$(( \${COUNT} + 5 ))
         sleep 5
@@ -86,7 +86,7 @@ echo "Checking OSGi bundles..."
 EOF
 
 scp ${WORKSPACE}/controller-script.sh $CONTROLLER0:/tmp
-ssh $CONTROLLER0 'bash /tmp/controller-script.sh'
+ssh ${CONTROLLER0} 'bash /tmp/controller-script.sh'
 
 echo "Changing the testplan path..."
 cat ${WORKSPACE}/test/csit/testplans/${TESTPLAN} | sed "s:integration:${WORKSPACE}:" > testplan.txt
@@ -95,10 +95,10 @@ cat testplan.txt
 SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' ' )
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} -c critical -e exclude -v CONTROLLER:${CONTROLLER0} -v MININET:${MININET0} -v MININET_USER:${USER} -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES}
+pybot -N ${TESTPLAN} -c critical -e exclude --loglevel TRACE -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp -v CONTROLLER:${CONTROLLER0} -v MININET:${MININET0} -v MININET_USER:${USER} -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES}
 
 echo "Fetching Karaf log"
-scp $CONTROLLER0:/tmp/$BUNDLEFOLDER/data/log/karaf.log .
+scp ${CONTROLLER0}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log .
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :