Repository: cloudstack Updated Branches: refs/heads/4.3 514c2ef0f -> 28500840a
travis: remove --zone and --hypervisor for 4.3 branch 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/28500840 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/28500840 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/28500840 Branch: refs/heads/4.3 Commit: 28500840a1e26f51c0fc071356acc790cc26b1ec Parents: 514c2ef Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Mon Sep 1 17:25:18 2014 +0200 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Mon Sep 1 17:25:18 2014 +0200 ---------------------------------------------------------------------- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/28500840/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index bc9b713..0ca3e3b 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 --zone=Sandbox-simulator --hypervisor=simulator ; 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,required_hardware=false ; done - python ./tools/travis/xunit-reader.py integration-test-results/ after_success: ./tools/travis/after_success.sh after_failure: ./tools/travis/after_failure.sh
