openstack/project-config
Code Issues Proposed changes

Fix swiftclient func tests to run using both auth versions

Browse Source 
The rationale for this change is the same as for merged change
to swift func tests job [1].

The swiftclient functional test job was changed to run
tox -e func as sudo [2]. 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 [2] causes this env var to be lost,
so the tests run against keystoneauth again.

[1] change id Ibea153e94e7919b5422a344d365cee3106efb2fe
[2] change id Ifc3e862b0fe86928c3943a41f07cd086d6ace6fe

Change-Id: Ieea3efbd6526edb8038b677a2e2278107acfe211
This commit is contained in:
Alistair Coles 2015-03-03 15:35:46 +00:00
parent 79abad1df1
commit 17fda64f22
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jenkins/jobs/swift.yaml
View File

@ -70,8 +70,8 @@
cd /opt/stack/new/python-swiftclient cd /opt/stack/new/python-swiftclient
# Launch V2 auth tests and v1 tests after. # Launch V2 auth tests and v1 tests after.
sudo -H -u stack timeout -s 9 ${{FUNCTEST_TIMEOUT}}m tox -e func && \ 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 SWIFT_TEST_CONFIG_FILE=/opt/stack/new/swift/test/sample.conf \
sudo -H -u stack timeout -s 9 ${{FUNCTEST_TIMEOUT}}m tox -e func timeout -s 9 ${{FUNCTEST_TIMEOUT}}m tox -e func
}} }}
export -f post_test_hook export -f post_test_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh