Repository: cloudstack Updated Branches: refs/heads/4.3 9669a2031 -> 2a87d7e8c
travis: remove the marvin flag require_hardware which is not needed for 4.3 Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2a87d7e8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2a87d7e8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2a87d7e8 Branch: refs/heads/4.3 Commit: 2a87d7e8c16f2dd2461333043455145f451ee550 Parents: 9669a20 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Mon Sep 1 19:37:48 2014 +0200 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Mon Sep 1 19:38:27 2014 +0200 ---------------------------------------------------------------------- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a87d7e8/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 0ca3e3b..de8feee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ before_script: travis_wait 30 ./tools/travis/before_script.sh script: - mkdir -p integration-test-results/misc - travis_wait 30 sleep 30 -- for suite in $TESTS; do travis_wait 30 nosetests --with-xunit --xunit-file=integration-test-results/$suite.xml --with-marvin --marvin-config=setup/dev/advanced.cfg test/integration/smoke/$suite.py -s -a tags=advanced,required_hardware=false ; done +- for suite in $TESTS; do travis_wait 30 nosetests --with-xunit --xunit-file=integration-test-results/$suite.xml --with-marvin --marvin-config=setup/dev/advanced.cfg test/integration/smoke/$suite.py -s -a tags=advanced ; done - python ./tools/travis/xunit-reader.py integration-test-results/ after_success: ./tools/travis/after_success.sh after_failure: ./tools/travis/after_failure.sh
