From 73b96a02f77690f54984fe3603268a547fc6bac4 Mon Sep 17 00:00:00 2001 From: Alistair Coles Date: Tue, 24 Feb 2015 12:27:51 +0000 Subject: [PATCH] Fix swift func tests to run using both auth versions The swift functional test job was changed to run tox -e func as sudo [1]. The job first runs functional tests against keystone, then repeats the tests against tempauth. The second part of the job requires SWIFT_TEST_CONFIG_FILE env var to be set to cause the tests to run against tempauth. The introduction of sudo in [1] causes this env var to be lost, so the tests run against keystoneauth again. A tell-tale is that the second run of the functional tests should output "SKIPPING FUNCTIONAL TESTS SPECIFIC TO AUTH VERSION 3" before the first line of test results. This has been missing since [1] was merged. [1] change id Ifc3e862b0fe86928c3943a41f07cd086d6ace6fe Change-Id: Ibea153e94e7919b5422a344d365cee3106efb2fe --- jenkins/jobs/swift.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/jobs/swift.yaml b/jenkins/jobs/swift.yaml index b53c12318b..4a65a7fa77 100644 --- a/jenkins/jobs/swift.yaml +++ b/jenkins/jobs/swift.yaml @@ -28,8 +28,8 @@ cd /opt/stack/new/swift # Launch V2 auth tests and v1 tests after. sudo -H -u stack timeout -s 9 ${{FUNCTEST_TIMEOUT}}m tox -e func && \ - SWIFT_TEST_CONFIG_FILE=/opt/stack/new/swift/test/sample.conf \ - sudo -H -u stack timeout -s 9 ${{FUNCTEST_TIMEOUT}}m tox -e func + sudo -H -u stack SWIFT_TEST_CONFIG_FILE=/opt/stack/new/swift/test/sample.conf \ + 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