17fda64f22
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
83 lines
2.7 KiB
YAML
83 lines
2.7 KiB
YAML
- job-template:
|
|
name: '{pipeline}-swift-dsvm-functional{branch-designator}'
|
|
node: '{node}'
|
|
|
|
wrappers:
|
|
- build-timeout:
|
|
timeout: 95
|
|
- timestamps
|
|
|
|
builders:
|
|
- link-logs
|
|
- net-info
|
|
- devstack-checkout
|
|
- shell: |
|
|
#!/bin/bash -xe
|
|
export PYTHONUNBUFFERED=true
|
|
export DEVSTACK_GATE_TIMEOUT=90
|
|
export FUNCTEST_TIMEOUT=30
|
|
export DEVSTACK_GATE_TEMPEST=0
|
|
export DEVSTACK_GATE_EXERCISES=0
|
|
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
|
export BRANCH_OVERRIDE={branch-override}
|
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
|
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
|
fi
|
|
|
|
function post_test_hook {{
|
|
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 && \
|
|
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
|
|
./safe-devstack-vm-gate-wrap.sh
|
|
|
|
publishers:
|
|
- devstack-logs
|
|
- console-log
|
|
|
|
- job-template:
|
|
name: '{pipeline}-swiftclient-dsvm-functional{branch-designator}'
|
|
node: '{node}'
|
|
|
|
wrappers:
|
|
- build-timeout:
|
|
timeout: 95
|
|
- timestamps
|
|
|
|
builders:
|
|
- link-logs
|
|
- net-info
|
|
- devstack-checkout
|
|
- shell: |
|
|
#!/bin/bash -xe
|
|
export PYTHONUNBUFFERED=true
|
|
export DEVSTACK_GATE_TIMEOUT=90
|
|
export FUNCTEST_TIMEOUT=30
|
|
export DEVSTACK_GATE_TEMPEST=0
|
|
export DEVSTACK_GATE_EXERCISES=0
|
|
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
|
export BRANCH_OVERRIDE={branch-override}
|
|
export DEVSTACK_PROJECT_FROM_GIT=python-swiftclient
|
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
|
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
|
fi
|
|
|
|
function post_test_hook {{
|
|
cd /opt/stack/new/python-swiftclient
|
|
# 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 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
|
|
./safe-devstack-vm-gate-wrap.sh
|
|
|
|
publishers:
|
|
- devstack-logs
|
|
- console-log
|