diff --git a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml index e5ffbf1bdb..91e15e59df 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml @@ -2,9 +2,8 @@ name: '{name}-tox-doc-{envlist}' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/barbican.yaml b/modules/openstack_project/files/jenkins_job_builder/config/barbican.yaml index 24fe684099..2521533e7f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/barbican.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/barbican.yaml @@ -3,9 +3,8 @@ node: 'devstack-precise || devstack-trusty' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml b/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml index 1d940222ad..360a33b21d 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml @@ -3,9 +3,8 @@ node: 'devstack-precise || devstack-trusty' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml index 8058ee25ac..d20018629b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml @@ -3,9 +3,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 60 - fail: true - timestamps builders: @@ -23,9 +22,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 60 - fail: true - timestamps builders: @@ -43,9 +41,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 60 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml index 968d4c31b2..4a42148f96 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml @@ -3,9 +3,8 @@ node: 'devstack-precise || devstack-trusty' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index a3166be5e9..3b3c8a7ffb 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -3,9 +3,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -31,9 +30,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -58,9 +56,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 60 - fail: true - timestamps builders: @@ -99,9 +96,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -130,9 +126,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -162,9 +157,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -193,9 +187,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 185 - fail: true - timestamps builders: @@ -225,9 +218,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: @@ -258,9 +250,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -291,9 +282,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -325,9 +315,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -360,9 +349,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -393,9 +381,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -427,9 +414,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: @@ -459,9 +445,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -493,9 +478,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -528,9 +512,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -595,9 +578,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -633,9 +615,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: @@ -665,9 +646,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -698,9 +678,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: @@ -729,9 +708,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: @@ -759,9 +737,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: @@ -791,9 +768,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: @@ -823,9 +799,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -857,9 +832,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -891,9 +865,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -926,9 +899,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 185 - fail: true - timestamps builders: @@ -959,9 +931,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -994,9 +965,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 130 - fail: true - timestamps builders: @@ -1026,9 +996,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 130 - fail: true - timestamps builders: @@ -1059,9 +1028,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 130 - fail: true - timestamps builders: @@ -1092,9 +1060,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 130 - fail: true - timestamps builders: @@ -1126,9 +1093,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 130 - fail: true - timestamps builders: @@ -1159,9 +1125,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -1191,9 +1156,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -1223,9 +1187,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -1255,9 +1218,8 @@ node: 'devstack-f20' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerrit-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/gerrit-plugin-jobs.yaml index f1b16c640d..6ec1430f02 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/gerrit-plugin-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/gerrit-plugin-jobs.yaml @@ -4,9 +4,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 30 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml index 55fbfed346..c7121f1527 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml @@ -4,9 +4,8 @@ node: 'bare-precise || bare-trusty' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps prebuilders: @@ -38,9 +37,8 @@ node: 'bare-precise || bare-trusty' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps prebuilders: @@ -67,9 +65,8 @@ node: 'bare-precise || bare-trusty' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps prebuilders: @@ -99,9 +96,8 @@ node: 'bare-precise || bare-trusty' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: @@ -138,9 +134,8 @@ node: 'bare-precise || bare-trusty' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: @@ -173,9 +168,8 @@ node: 'bare-precise || bare-trusty' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml b/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml index 0512ab035a..6fd53a31a2 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml @@ -3,9 +3,8 @@ node: 'devstack-precise || devstack-trusty' wrappers: - - timeout: + - build-timeout: timeout: 120 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml b/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml index 1fd8264aaa..c6614dc763 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml @@ -17,9 +17,8 @@ node: 'bare-precise || bare-trusty' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml index 3e278c4a0c..d27355554f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml @@ -2,9 +2,8 @@ name: 'gate-{name}-js-unittests' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml index dbf6b7756e..9db02ee5b5 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml @@ -6,9 +6,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 30 - fail: true - timestamps builders: @@ -34,9 +33,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 30 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/magnetodb.yaml b/modules/openstack_project/files/jenkins_job_builder/config/magnetodb.yaml index 0faf7cfb3a..538865c80e 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/magnetodb.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/magnetodb.yaml @@ -3,9 +3,8 @@ node: 'devstack-precise || devstack-trusty' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml index 4e6059c022..7af952b114 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml @@ -3,9 +3,8 @@ node: 'devstack-precise || devstack-trusty' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: @@ -48,9 +47,8 @@ node: 'devstack-precise || devstack-trusty' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml index eef439e34b..65fb10faef 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml @@ -50,9 +50,8 @@ name: 'gate-{name}-tox-doc-publish-{envlist}' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml index 94f9a62fb0..224010ef5b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml @@ -6,9 +6,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 30 - fail: true - timestamps builders: @@ -34,9 +33,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 30 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml b/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml index ebaa64b990..3fce98b6f3 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml @@ -3,9 +3,8 @@ node: mirror26 wrappers: - - timeout: + - build-timeout: timeout: 90 - fail: true - timestamps builders: @@ -23,9 +22,8 @@ node: mirror26 wrappers: - - timeout: + - build-timeout: timeout: 90 - fail: true - timestamps builders: @@ -43,9 +41,8 @@ node: mirror27 wrappers: - - timeout: + - build-timeout: timeout: 60 - fail: true - timestamps builders: @@ -63,9 +60,8 @@ node: mirror27 wrappers: - - timeout: + - build-timeout: timeout: 60 - fail: true - timestamps builders: @@ -83,9 +79,8 @@ node: mirror33 wrappers: - - timeout: + - build-timeout: timeout: 60 - fail: true - timestamps builders: @@ -103,9 +98,8 @@ node: mirror33 wrappers: - - timeout: + - build-timeout: timeout: 60 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/mistral.yaml b/modules/openstack_project/files/jenkins_job_builder/config/mistral.yaml index 441919ae78..73c4591d59 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/mistral.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/mistral.yaml @@ -3,9 +3,8 @@ node: 'devstack-precise || devstack-trusty' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/murano.yaml b/modules/openstack_project/files/jenkins_job_builder/config/murano.yaml index e146a20dca..1babc9bb84 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/murano.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/murano.yaml @@ -3,9 +3,8 @@ node: 'devstack-precise || devstack-trusty' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/neutron-api.yaml b/modules/openstack_project/files/jenkins_job_builder/config/neutron-api.yaml index 71b934f7a0..da82f6cdd6 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/neutron-api.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/neutron-api.yaml @@ -3,9 +3,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/neutron-functional.yaml b/modules/openstack_project/files/jenkins_job_builder/config/neutron-functional.yaml index 142d9f57e2..a9706e876a 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/neutron-functional.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/neutron-functional.yaml @@ -3,9 +3,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/nova-docker.yaml b/modules/openstack_project/files/jenkins_job_builder/config/nova-docker.yaml index 83a5f0f088..8765b5aee5 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/nova-docker.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/nova-docker.yaml @@ -3,9 +3,8 @@ node: 'devstack-f20' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml b/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml index 12cd3a27ab..378b3e3ff0 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml @@ -3,9 +3,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 95 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml index b985ed407f..1fd5ffdddd 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml @@ -2,9 +2,8 @@ name: 'periodic-{name}-python26{branch-name}' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: @@ -27,9 +26,8 @@ name: 'periodic-{name}-python27{branch-name}' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: @@ -52,9 +50,8 @@ name: 'periodic-{name}-docs{branch-name}' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml index ec0e7c810f..84aa7ce3d6 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml @@ -2,9 +2,8 @@ name: '{name}-coverage' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: @@ -69,9 +68,8 @@ name: 'gate-{name}-python26' wrappers: - - timeout: + - build-timeout: timeout: 70 - fail: true - timestamps builders: @@ -92,9 +90,8 @@ name: 'gate-{name}-python27' wrappers: - - timeout: + - build-timeout: timeout: 50 - fail: true - timestamps builders: @@ -115,9 +112,8 @@ name: 'gate-{name}-python33' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: @@ -138,9 +134,8 @@ name: 'gate-{name}-pypy' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: @@ -177,9 +172,8 @@ name: 'gate-{name}-tox-{envlist}' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml index ac2fc0a2ff..1290d2f794 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml @@ -57,9 +57,8 @@ node: 'devstack-precise || devstack-trusty' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -78,9 +77,8 @@ node: 'devstack-precise || devstack-trusty' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml index c648219e52..e2cadd10eb 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml @@ -3,9 +3,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml index 4b05b9ae1b..b8ff4842f6 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml @@ -3,9 +3,8 @@ node: 'devstack-precise || devstack-trusty' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: @@ -45,9 +44,8 @@ node: 'devstack-f20' wrappers: - - timeout: + - build-timeout: timeout: 65 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/sqlalchemy-migrate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/sqlalchemy-migrate.yaml index c7e72b2924..a31357ac2a 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/sqlalchemy-migrate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/sqlalchemy-migrate.yaml @@ -3,9 +3,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 185 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/swift.yaml b/modules/openstack_project/files/jenkins_job_builder/config/swift.yaml index 25c3a41240..1d01de01b9 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/swift.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/swift.yaml @@ -3,9 +3,8 @@ node: '{node}' wrappers: - - timeout: + - build-timeout: timeout: 95 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml index e28a179f74..2c52a52bdf 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml @@ -3,9 +3,8 @@ node: 'tripleo-precise' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -44,9 +43,8 @@ node: 'tripleo-precise' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -84,9 +82,8 @@ node: 'tripleo-precise' wrappers: - - timeout: + - build-timeout: timeout: 125 - fail: true - timestamps builders: @@ -125,9 +122,8 @@ node: 'tripleo-precise' wrappers: - - timeout: + - build-timeout: timeout: 145 - fail: true - timestamps builders: @@ -165,9 +161,8 @@ node: 'tripleo-f20' wrappers: - - timeout: + - build-timeout: timeout: 145 - fail: true - timestamps builders: @@ -205,9 +200,8 @@ node: 'tripleo-precise' wrappers: - - timeout: + - build-timeout: timeout: 145 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml b/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml index 600adca7fc..4e475e4d95 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml @@ -32,9 +32,8 @@ node: 'devstack-precise || devstack-trusty' wrappers: - - timeout: + - build-timeout: timeout: 85 - fail: true - timestamps builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml index 05bb208055..cffae1b1f9 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml @@ -38,9 +38,8 @@ name: 'periodic-test' wrappers: - - timeout: + - build-timeout: timeout: 40 - fail: true - timestamps builders: