From d28dd5286efa84440e014961c8a4cf28bc981685 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 7 Aug 2012 08:27:03 -0700 Subject: [PATCH] Change 20 min timeouts to 30. Also, remove ansi color setting, because it really munged up the output when it was used. Change-Id: Id0dac3bfbc40987b98501ced7d1158f1a83a1e02 Reviewed-on: https://review.openstack.org/10968 Approved: Monty Taylor Reviewed-by: Monty Taylor Tested-by: Jenkins --- .../files/projects/openstack/ceilometer.yml | 6 ++---- .../files/projects/openstack/devstack-gate.yml | 7 +------ .../files/projects/openstack/devstack.yml | 3 +-- .../gerrit-verification-status-plugin.yml | 3 +-- .../files/projects/openstack/gerrit.yml | 3 +-- .../files/projects/openstack/gerritbot.yml | 13 +++++-------- .../files/projects/openstack/gerritlib.yml | 12 ++++-------- .../files/projects/openstack/horizon.yml | 3 +-- .../projects/openstack/jenkins-job-builder.yml | 3 +-- .../files/projects/openstack/mraas.yml | 6 ++---- .../projects/openstack/openstack-ci-puppet.yml | 6 ++---- .../files/projects/openstack/pypi-mirror.yml | 6 ++---- .../files/projects/openstack/requirements.yml | 2 +- .../files/projects/openstack/tempest.yml | 6 ++---- .../files/projects/openstack/zuul.yml | 6 ++---- .../files/templates/openstack_publish_jobs.yml | 6 ++---- .../jenkins_jobs/files/templates/pypi_jobs.yml | 9 +++------ .../files/templates/python_bitrot_jobs.yml | 9 +++------ .../files/templates/python_jobs.yml | 18 ++++++------------ 19 files changed, 42 insertions(+), 85 deletions(-) diff --git a/modules/jenkins_jobs/files/projects/openstack/ceilometer.yml b/modules/jenkins_jobs/files/projects/openstack/ceilometer.yml index c88148532a..62500a3e8b 100644 --- a/modules/jenkins_jobs/files/projects/openstack/ceilometer.yml +++ b/modules/jenkins_jobs/files/projects/openstack/ceilometer.yml @@ -17,10 +17,9 @@ main: project: 'ceilometer' authenticatedBuild: 'false' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul @@ -44,10 +43,9 @@ main: project: 'ceilometer' authenticatedBuild: 'false' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul diff --git a/modules/jenkins_jobs/files/projects/openstack/devstack-gate.yml b/modules/jenkins_jobs/files/projects/openstack/devstack-gate.yml index 35756d39ec..425cbd1672 100644 --- a/modules/jenkins_jobs/files/projects/openstack/devstack-gate.yml +++ b/modules/jenkins_jobs/files/projects/openstack/devstack-gate.yml @@ -6,10 +6,9 @@ main: github_org: 'openstack-ci' project: 'devstack-gate' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -38,7 +37,6 @@ main: timeout: 40 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -110,7 +108,6 @@ main: timeout: 90 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -186,7 +183,6 @@ main: timeout: 10 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -227,7 +223,6 @@ main: timeout: 10 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 diff --git a/modules/jenkins_jobs/files/projects/openstack/devstack.yml b/modules/jenkins_jobs/files/projects/openstack/devstack.yml index 7b1812431b..9ce4c66201 100644 --- a/modules/jenkins_jobs/files/projects/openstack/devstack.yml +++ b/modules/jenkins_jobs/files/projects/openstack/devstack.yml @@ -6,10 +6,9 @@ main: github_org: 'openstack-dev' project: 'devstack' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul diff --git a/modules/jenkins_jobs/files/projects/openstack/gerrit-verification-status-plugin.yml b/modules/jenkins_jobs/files/projects/openstack/gerrit-verification-status-plugin.yml index c6cac1d262..92b895dcbe 100644 --- a/modules/jenkins_jobs/files/projects/openstack/gerrit-verification-status-plugin.yml +++ b/modules/jenkins_jobs/files/projects/openstack/gerrit-verification-status-plugin.yml @@ -6,10 +6,9 @@ main: project: 'gerrit-verification-status-plugin' authenticatedBuild: 'false' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul diff --git a/modules/jenkins_jobs/files/projects/openstack/gerrit.yml b/modules/jenkins_jobs/files/projects/openstack/gerrit.yml index 57c64bb3a3..8543f80061 100644 --- a/modules/jenkins_jobs/files/projects/openstack/gerrit.yml +++ b/modules/jenkins_jobs/files/projects/openstack/gerrit.yml @@ -7,10 +7,9 @@ main: project: 'gerrit' authenticatedBuild: 'false' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul diff --git a/modules/jenkins_jobs/files/projects/openstack/gerritbot.yml b/modules/jenkins_jobs/files/projects/openstack/gerritbot.yml index 77ef63bc2c..222704563d 100644 --- a/modules/jenkins_jobs/files/projects/openstack/gerritbot.yml +++ b/modules/jenkins_jobs/files/projects/openstack/gerritbot.yml @@ -6,10 +6,9 @@ main: github_org: 'openstack-ci' project: 'gerritbot' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -38,10 +37,9 @@ main: github_org: 'openstack-ci' project: 'gerritbot' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -73,10 +71,9 @@ main: github_org: 'openstack-ci' project: 'gerritbot' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -104,7 +101,7 @@ main: github_org: 'openstack-ci' project: 'gerritbot' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true logrotate: @@ -145,7 +142,7 @@ main: github_org: 'openstack-ci' project: 'gerritbot' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true triggers: diff --git a/modules/jenkins_jobs/files/projects/openstack/gerritlib.yml b/modules/jenkins_jobs/files/projects/openstack/gerritlib.yml index aa3df7f4e2..66c90140df 100644 --- a/modules/jenkins_jobs/files/projects/openstack/gerritlib.yml +++ b/modules/jenkins_jobs/files/projects/openstack/gerritlib.yml @@ -6,10 +6,9 @@ main: github_org: 'openstack-ci' project: 'gerritlib' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -38,10 +37,9 @@ main: github_org: 'openstack-ci' project: 'gerritlib' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -73,10 +71,9 @@ main: github_org: 'openstack-ci' project: 'gerritlib' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -104,10 +101,9 @@ main: github_org: 'openstack-ci' project: 'gerritlib' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul_post diff --git a/modules/jenkins_jobs/files/projects/openstack/horizon.yml b/modules/jenkins_jobs/files/projects/openstack/horizon.yml index 5d46929645..88f50f8e29 100644 --- a/modules/jenkins_jobs/files/projects/openstack/horizon.yml +++ b/modules/jenkins_jobs/files/projects/openstack/horizon.yml @@ -30,10 +30,9 @@ main: github_org: 'openstack' project: 'horizon' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 diff --git a/modules/jenkins_jobs/files/projects/openstack/jenkins-job-builder.yml b/modules/jenkins_jobs/files/projects/openstack/jenkins-job-builder.yml index 7a413c8b72..c9a201ad3b 100644 --- a/modules/jenkins_jobs/files/projects/openstack/jenkins-job-builder.yml +++ b/modules/jenkins_jobs/files/projects/openstack/jenkins-job-builder.yml @@ -6,10 +6,9 @@ main: github_org: 'openstack-ci' project: 'jenkins-job-builder' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul diff --git a/modules/jenkins_jobs/files/projects/openstack/mraas.yml b/modules/jenkins_jobs/files/projects/openstack/mraas.yml index 2f67815288..858b7ed50b 100644 --- a/modules/jenkins_jobs/files/projects/openstack/mraas.yml +++ b/modules/jenkins_jobs/files/projects/openstack/mraas.yml @@ -5,10 +5,9 @@ main: review_site: 'review.openstack.org' project: 'MRaaS' authenticatedBuild: 'false' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - gerrit: @@ -41,10 +40,9 @@ main: review_site: 'review.openstack.org' project: 'MRaaS' authenticatedBuild: 'false' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - gerrit: diff --git a/modules/jenkins_jobs/files/projects/openstack/openstack-ci-puppet.yml b/modules/jenkins_jobs/files/projects/openstack/openstack-ci-puppet.yml index fc0c17d044..49a5a57dbc 100644 --- a/modules/jenkins_jobs/files/projects/openstack/openstack-ci-puppet.yml +++ b/modules/jenkins_jobs/files/projects/openstack/openstack-ci-puppet.yml @@ -6,10 +6,9 @@ main: github_org: 'openstack' project: 'openstack-ci-puppet' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul @@ -31,10 +30,9 @@ main: github_org: 'openstack' project: 'openstack-ci-puppet' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul diff --git a/modules/jenkins_jobs/files/projects/openstack/pypi-mirror.yml b/modules/jenkins_jobs/files/projects/openstack/pypi-mirror.yml index ccdde052cd..1b245b8db6 100644 --- a/modules/jenkins_jobs/files/projects/openstack/pypi-mirror.yml +++ b/modules/jenkins_jobs/files/projects/openstack/pypi-mirror.yml @@ -6,10 +6,9 @@ main: github_org: 'openstack-ci' project: 'pypi-mirror' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul @@ -32,10 +31,9 @@ main: github_org: 'openstack-ci' project: 'pypi-mirror' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul diff --git a/modules/jenkins_jobs/files/projects/openstack/requirements.yml b/modules/jenkins_jobs/files/projects/openstack/requirements.yml index 9e88d2b557..70b08cf862 100644 --- a/modules/jenkins_jobs/files/projects/openstack/requirements.yml +++ b/modules/jenkins_jobs/files/projects/openstack/requirements.yml @@ -6,7 +6,7 @@ main: github_org: 'openstack' project: 'requirements' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true triggers: diff --git a/modules/jenkins_jobs/files/projects/openstack/tempest.yml b/modules/jenkins_jobs/files/projects/openstack/tempest.yml index 37ac27c3af..efaba03a7e 100644 --- a/modules/jenkins_jobs/files/projects/openstack/tempest.yml +++ b/modules/jenkins_jobs/files/projects/openstack/tempest.yml @@ -6,10 +6,9 @@ main: github_org: 'openstack-ci' project: 'tempest' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul @@ -35,10 +34,9 @@ main: github_org: 'openstack-ci' project: 'tempest' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul diff --git a/modules/jenkins_jobs/files/projects/openstack/zuul.yml b/modules/jenkins_jobs/files/projects/openstack/zuul.yml index bdc00c4dde..c4913b4c85 100644 --- a/modules/jenkins_jobs/files/projects/openstack/zuul.yml +++ b/modules/jenkins_jobs/files/projects/openstack/zuul.yml @@ -16,10 +16,9 @@ main: github_org: 'openstack-ci' project: 'zuul' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul @@ -43,10 +42,9 @@ main: project: 'zuul' authenticatedBuild: 'false' concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul_post diff --git a/modules/jenkins_jobs/files/templates/openstack_publish_jobs.yml b/modules/jenkins_jobs/files/templates/openstack_publish_jobs.yml index b272c7f4b1..2a8415dcd3 100644 --- a/modules/jenkins_jobs/files/templates/openstack_publish_jobs.yml +++ b/modules/jenkins_jobs/files/templates/openstack_publish_jobs.yml @@ -8,10 +8,9 @@ main: authenticatedBuild: 'false' disabled: @DISABLED@ concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul_post @@ -50,10 +49,9 @@ main: authenticatedBulid: 'false' disabled: @DISABLED@ concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 diff --git a/modules/jenkins_jobs/files/templates/pypi_jobs.yml b/modules/jenkins_jobs/files/templates/pypi_jobs.yml index b04f3930ca..d2052d1694 100644 --- a/modules/jenkins_jobs/files/templates/pypi_jobs.yml +++ b/modules/jenkins_jobs/files/templates/pypi_jobs.yml @@ -8,10 +8,9 @@ main: authenticatedBuild: 'false' disabled: @DISABLED@ concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul_post @@ -50,10 +49,9 @@ main: authenticatedBulid: 'false' disabled: @DISABLED@ concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -95,10 +93,9 @@ main: authenticatedBulid: 'false' disabled: @DISABLED@ concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true triggers: - zuul_post diff --git a/modules/jenkins_jobs/files/templates/python_bitrot_jobs.yml b/modules/jenkins_jobs/files/templates/python_bitrot_jobs.yml index 8bc0b9e721..4f09a599c6 100644 --- a/modules/jenkins_jobs/files/templates/python_bitrot_jobs.yml +++ b/modules/jenkins_jobs/files/templates/python_bitrot_jobs.yml @@ -8,10 +8,9 @@ main: authenticatedBuild: 'false' disabled: @DISABLED@ concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -48,10 +47,9 @@ main: authenticatedBuild: 'false' disabled: @DISABLED@ concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -87,10 +85,9 @@ main: authenticatedBuild: 'false' disabled: @DISABLED@ concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 diff --git a/modules/jenkins_jobs/files/templates/python_jobs.yml b/modules/jenkins_jobs/files/templates/python_jobs.yml index 2273ffffbb..cb949921b9 100644 --- a/modules/jenkins_jobs/files/templates/python_jobs.yml +++ b/modules/jenkins_jobs/files/templates/python_jobs.yml @@ -8,10 +8,9 @@ main: authenticatedBuild: 'false' disabled: @DISABLED@ concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -45,10 +44,9 @@ main: authenticatedBuild: 'false' disabled: @DISABLED@ concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -82,10 +80,9 @@ main: authenticatedBuild: 'false' disabled: @DISABLED@ concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -121,10 +118,9 @@ main: authenticatedBuild: 'false' disabled: @DISABLED@ concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -165,10 +161,9 @@ main: authenticatedBuild: 'false' disabled: @DISABLED@ concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28 @@ -198,10 +193,9 @@ main: authenticatedBuild: 'false' disabled: @DISABLED@ concurrent: 'true' - timeout: 20 + timeout: 30 timeout_fail: true timestamps: true - ansicolor: true logrotate: daysToKeep: 28