Remove DEVSTACK_GATE_TIMEOUT [part 2]

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/d*.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.

Note that the builder devstack-virtual-ironic uses devstack-timeout
for setting DEVSTACK_GATE_TIMEOUT, remove devstack-timeout as well,
it is not needed anymore.

Change-Id: Ib9677376758475a4aa34c69b73428877e20556b2
This commit is contained in:
Andreas Jaeger 2016-02-05 19:07:27 +01:00
parent 4f14555751
commit ca3bc6c788
3 changed files with 76 additions and 153 deletions

View File

@ -5,7 +5,7 @@
wrappers:
- build-timeout:
timeout: 65
timeout: 70
- timestamps
builders:
@ -15,7 +15,6 @@
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
@ -78,7 +77,7 @@
wrappers:
- build-timeout:
timeout: 65
timeout: 70
- timestamps
builders:
@ -88,7 +87,6 @@
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_NOTESTS=1

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@
wrappers:
- build-timeout:
timeout: 125
timeout: 130
- timestamps
builders:
@ -14,7 +14,6 @@
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST=1
export BRANCH_OVERRIDE={branch-override}
@ -49,7 +48,7 @@
wrappers:
- build-timeout:
timeout: 125
timeout: 130
- timestamps
builders:
@ -59,7 +58,6 @@
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_NEUTRON=1
export RALLY_SCENARIO=dragonflow
export BRANCH_OVERRIDE={branch-override}
@ -96,7 +94,7 @@
wrappers:
- build-timeout:
timeout: 125
timeout: 130
- timestamps
builders:
@ -108,7 +106,6 @@
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_INSTALL_TESTONLY=1
@ -141,4 +138,4 @@
publishers:
- test-results
- devstack-logs
- console-log
- console-log