project-config/jenkins/jobs/neutron-vpnaas.yaml
Andreas Jaeger 065a80d9c2 Remove DEVSTACK_GATE_TIMEOUT [part 4]
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
2016-02-07 10:45:25 +01:00

46 lines
1.4 KiB
YAML

- job-template:
name: '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}{job-suffix}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 130
- timestamps
builders:
- print-template-name:
template-name: "{template-name}"
- link-logs
- net-info
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_UNSTACK=1
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
function gate_hook {{
bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/tests/contrib/gate_hook.sh dsvm-{vpnaastest}
}}
export -f gate_hook
function post_test_hook {{
bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/tests/contrib/post_test_hook.sh dsvm-{vpnaastest}
}}
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:
- test-results
- devstack-logs
- console-log