From 091a6c7e9cfab76f5df012f1f3fe8f497317d035 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 17 Feb 2015 12:34:00 -0500 Subject: [PATCH] have swift functional tests use tox the swift functional tests should use tox targets when run in the gate so that their test requirements can be specified in the swift project itself, instead of being bound to what might be available in the base image. Depends-On: I730f1bb530215ba7c30bf32a1c3bbc16edd5c217 Change-Id: Ida1ee74162cb3b0f575364f9e4bf7742ccd9a794 --- jenkins/jobs/swift.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jenkins/jobs/swift.yaml b/jenkins/jobs/swift.yaml index a95cabf226..fa36f9fd81 100644 --- a/jenkins/jobs/swift.yaml +++ b/jenkins/jobs/swift.yaml @@ -27,9 +27,9 @@ function post_test_hook {{ cd /opt/stack/new/swift # Launch V2 auth tests and v1 tests after. - timeout -s 9 ${{FUNCTEST_TIMEOUT}}m bash .functests --verbosity=3 && \ + timeout -s 9 ${{FUNCTEST_TIMEOUT}}m tox -e func && \ SWIFT_TEST_CONFIG_FILE=/opt/stack/new/swift/test/sample.conf \ - timeout -s 9 ${{FUNCTEST_TIMEOUT}}m bash .functests --verbosity=3 + timeout -s 9 ${{FUNCTEST_TIMEOUT}}m tox -e func }} export -f post_test_hook cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh @@ -69,9 +69,9 @@ cd /opt/stack/new/python-swiftclient sudo pip install -r test-requirements.txt # Launch V2 auth tests and v1 tests after. - timeout -s 9 ${{FUNCTEST_TIMEOUT}}m bash .functests --verbosity=3 && \ + timeout -s 9 ${{FUNCTEST_TIMEOUT}}m tox -e func && \ SWIFT_TEST_CONFIG_FILE=/opt/stack/new/swift/test/sample.conf \ - timeout -s 9 ${{FUNCTEST_TIMEOUT}}m bash .functests --verbosity=3 + timeout -s 9 ${{FUNCTEST_TIMEOUT}}m tox -e func }} export -f post_test_hook cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh