From c35b5d253849f9d6bd3a331df4b6cfe686a2b432 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 12 Nov 2018 16:24:58 +0530 Subject: [PATCH 1/2] travis: fail fast if --with-marvin fails with nose This fixes issue with recent Travis runs which gave incorrect results around smoketests with simulator where each test run failed with an error like "nosetests: error: no such option: --with-marvin". Signed-off-by: Rohit Yadav --- tools/travis/before_install.sh | 2 -- tools/travis/script.sh | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/travis/before_install.sh b/tools/travis/before_install.sh index d6fb25cfbb3a..1e399824ca3c 100755 --- a/tools/travis/before_install.sh +++ b/tools/travis/before_install.sh @@ -98,8 +98,6 @@ echo " echo -e "\nInstalling some python packages: " -pip install --user --upgrade pip - for ((i=0;i<$RETRY_COUNT;i++)) do pip install --user --upgrade lxml paramiko nose texttable ipmisim pyopenssl mock flask netaddr pylint pycodestyle six astroid > /tmp/piplog diff --git a/tools/travis/script.sh b/tools/travis/script.sh index c370225bb561..edf53ee0f09c 100755 --- a/tools/travis/script.sh +++ b/tools/travis/script.sh @@ -26,6 +26,8 @@ mkdir -p integration-test-results/component TESTS=($@) echo "Running tests: " ${TESTS[@]} +set -e + for suite in "${TESTS[@]}" ; do echo "Currently running test: $suite" nosetests --with-xunit --xunit-file=integration-test-results/$suite.xml --with-marvin --marvin-config=setup/dev/advanced.cfg test/integration/$suite.py -s -a tags=advanced,required_hardware=false --zone=Sandbox-simulator --hypervisor=simulator || true ; From 26c14857fd7ab3bd1a4bd1d107d909d23047f3ab Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 6 Dec 2018 23:58:44 +0530 Subject: [PATCH 2/2] install missing dependency pycrypto Signed-off-by: Rohit Yadav --- tools/travis/before_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis/before_install.sh b/tools/travis/before_install.sh index 1e399824ca3c..a084d380056f 100755 --- a/tools/travis/before_install.sh +++ b/tools/travis/before_install.sh @@ -100,7 +100,7 @@ echo -e "\nInstalling some python packages: " for ((i=0;i<$RETRY_COUNT;i++)) do - pip install --user --upgrade lxml paramiko nose texttable ipmisim pyopenssl mock flask netaddr pylint pycodestyle six astroid > /tmp/piplog + pip install --user --upgrade lxml paramiko nose texttable ipmisim pyopenssl pycrypto mock flask netaddr pylint pycodestyle six astroid > /tmp/piplog if [[ $? -eq 0 ]]; then echo -e "\npython packages installed successfully" break;