Default to using robot directly
The docker containers are configured to have all dependencies
installed so no need for tox. Just use robot directly.
Tested: Cherry picked this into our jenkins job and verified
all ran as expected.
Change-Id: Ie7105a1ed500fe246b01b520f3d66722e3b0739f
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/scripts/run-robot.sh b/scripts/run-robot.sh
index 400b52d..25d2808 100755
--- a/scripts/run-robot.sh
+++ b/scripts/run-robot.sh
@@ -20,7 +20,11 @@
MACHINE=${MACHINE:-"qemu"}
ROBOT_CODE_HOME=${ROBOT_CODE_HOME:-/tmp/$(whoami)/${RANDOM}/obmc-robot/}
-ROBOT_TEST_CMD=${ROBOT_TEST_CMD:-"tox -e ${MACHINE} -- --argumentfile test_lists/QEMU_CI tests"}
+ROBOT_TEST_CMD=${ROBOT_TEST_CMD:-"python -m robot\
+ -v OPENBMC_HOST:${IP_ADDR}\
+ -v SSH_PORT:${SSH_PORT}\
+ -v HTTPS_PORT:${HTTPS_PORT}\
+ --argumentfile ./test_lists/QEMU_CI ./tests"}
git clone https://github.com/openbmc/openbmc-test-automation.git \
${ROBOT_CODE_HOME}
@@ -30,10 +34,6 @@
chmod ugo+rw -R ${ROBOT_CODE_HOME}/*
# Execute the CI tests
-export OPENBMC_HOST=${IP_ADDR}
-export SSH_PORT=${SSH_PORT}
-export HTTPS_PORT=${HTTPS_PORT}
-
"$($ROBOT_TEST_CMD)"
cp ${ROBOT_CODE_HOME}/*.xml ${HOME}/