065a80d9c2
With change Iff5e96bd80b8f165ccc7d6be09b53208613571eb, we do not need
to pass DEVSTACK_GATE_TIMEOUT anymore to devstack-gate, instead the
value from the build-timeout wrapper is passed.
Remove DEVSTACK_GATE_TIMEOUT for jenkins/jobs/[n-z]*.yaml
Increase timeout for all non-grenade jobs by 5 mins since
Iea866e4cc40e149e598f35e010ec855937bdf9ae will use a 10 minute buffer
and the internal timeout should stay the same. The grenade jobs already
have 10 mins of buffer, so no need adjust the timeout.
Adjust timeout for gate-rally-dsvm-cue-{broker},
the removed variable in builder devstack-cue-rally-gate was 100,
so set timeout to 110.
Change-Id: I623fff029fb2e0acdbe2bf93a13af02547062a71
82 lines
2.7 KiB
YAML
82 lines
2.7 KiB
YAML
- job-template:
|
|
name: '{pipeline}-swift-dsvm-functional{job-suffix}'
|
|
node: '{node}'
|
|
|
|
wrappers:
|
|
- build-timeout:
|
|
timeout: 100
|
|
- timestamps
|
|
|
|
builders:
|
|
- link-logs
|
|
- net-info
|
|
- devstack-checkout
|
|
- shell: |
|
|
#!/bin/bash -xe
|
|
export PYTHONUNBUFFERED=true
|
|
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{job-suffix}'
|
|
node: '{node}'
|
|
|
|
wrappers:
|
|
- build-timeout:
|
|
timeout: 100
|
|
- timestamps
|
|
|
|
builders:
|
|
- link-logs
|
|
- net-info
|
|
- devstack-checkout
|
|
- shell: |
|
|
#!/bin/bash -xe
|
|
export PYTHONUNBUFFERED=true
|
|
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 PROJECTS="openstack/python-swiftclient $PROJECTS"
|
|
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
|