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
43 lines
1.3 KiB
YAML
43 lines
1.3 KiB
YAML
- job-template:
|
|
name: '{pipeline}-scalpels-dsvm-neutron{job-suffix}-{ostype}'
|
|
node: '{ostype}'
|
|
|
|
wrappers:
|
|
- build-timeout:
|
|
timeout: 130
|
|
- timestamps
|
|
|
|
builders:
|
|
- link-logs
|
|
- net-info
|
|
- devstack-checkout
|
|
- shell: |
|
|
#!/bin/bash -xe
|
|
export PYTHONUNBUFFERED=true
|
|
export DEVSTACK_GATE_NEUTRON=1
|
|
export DEVSTACK_GATE_NEUTRON_DVR=1
|
|
export BRANCH_OVERRIDE={branch-override}
|
|
export PROJECTS="openstack/scalpels $PROJECTS"
|
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin scalpels https://git.openstack.org/openstack/scalpels"
|
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
|
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
|
fi
|
|
|
|
function pre_test_hook {{
|
|
# setup DEVSTACK_GATE_* options here
|
|
$BASE/new/scalpels/tests/ci/pre-test-hook.sh
|
|
}}
|
|
export -f pre_test_hook
|
|
|
|
function post_test_hook {{
|
|
$BASE/new/scalpels/tests/ci/scalpels-ci.sh
|
|
}}
|
|
|
|
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
|