Merge "Reduce timeout for heat functional job"

This commit is contained in:
Jenkins 2015-03-23 03:50:48 +00:00 committed by Gerrit Code Review
commit 30a1372801

View File

@ -58,7 +58,7 @@
wrappers: wrappers:
- build-timeout: - build-timeout:
timeout: 125 timeout: 75
- timestamps - timestamps
builders: builders:
@ -69,7 +69,7 @@
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
export OVERRIDE_ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,h-api,h-api-cfn,h-api-cw,h-eng,heat,key,mysql,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,q-vpn,quantum,rabbit,s-account,s-container,s-object,s-proxy,q-lbaas export OVERRIDE_ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,h-api,h-api-cfn,h-api-cw,h-eng,heat,key,mysql,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,q-vpn,quantum,rabbit,s-account,s-container,s-object,s-proxy,q-lbaas
export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TIMEOUT=70
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_EXERCISES=0 export DEVSTACK_GATE_EXERCISES=0