From d88bd1b81dcbcc129f0fc84582e9e1ed51dbf306 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 26 Dec 2013 09:36:40 -0800 Subject: [PATCH] Use Zuul to send email for periodic jobs Stop having Jenkins send the email reports and use the "new" smtp reporter in Zuul to send them. This will consolodate the emails (currently one per job) into a smaller number of summary email reports, which will be much more useful to the stable maint teams. They will also not include useless truncated console logs, but will contain links to the log server. This is a preliminary step to eliminate the periodic job definitions altogether. Change-Id: If637e0f4491ddbbb4d4e5806b0f999e21d8aa10f --- .../config/devstack-gate-periodic-jobs.yaml | 34 ----- .../config/python-bitrot-jobs.yaml | 8 -- .../openstack_project/files/zuul/layout.yaml | 117 ++++++++++-------- 3 files changed, 67 insertions(+), 92 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml index 5f541165f0..17fcbc13d7 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml @@ -24,8 +24,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-stable-maint@lists.openstack.org - job-template: @@ -55,8 +53,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-stable-maint@lists.openstack.org - job-template: @@ -86,8 +82,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-stable-maint@lists.openstack.org - job-template: @@ -116,8 +110,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-qa@lists.openstack.org - job-template: @@ -146,8 +138,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-qa@lists.openstack.org - job-template: @@ -178,8 +168,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-qa@lists.openstack.org - job-template: @@ -208,8 +196,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-qa@lists.openstack.org - job-template: @@ -239,8 +225,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-qa@lists.openstack.org - job-template: @@ -269,8 +253,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-qa@lists.openstack.org - job-template: @@ -299,8 +281,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-qa@lists.openstack.org - job-template: @@ -329,8 +309,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-qa@lists.openstack.org - job-template: @@ -360,8 +338,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-stable-maint@lists.openstack.org - job-template: @@ -392,8 +368,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-stable-maint@lists.openstack.org - job-template: @@ -424,8 +398,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-stable-maint@lists.openstack.org - job-template: name: 'periodic-devstack-dsvm-neutron{branch-designator}' @@ -452,8 +424,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-stable-maint@lists.openstack.org - job-template: @@ -485,8 +455,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-stable-maint@lists.openstack.org - job-template: @@ -519,8 +487,6 @@ publishers: - devstack-logs-periodic - console-log-periodic - - email: - recipients: openstack-stable-maint@lists.openstack.org - job-group: 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 21ee76ae05..3668b80d8f 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 @@ -21,8 +21,6 @@ keep-hierarchy: false copy-after-failure: true - console-log-periodic - - email: - recipients: '{email}' scm: - git: @@ -56,8 +54,6 @@ keep-hierarchy: false copy-after-failure: true - console-log-periodic - - email: - recipients: '{email}' scm: - git: @@ -84,8 +80,6 @@ publishers: - console-log-periodic - - email: - recipients: '{email}' scm: - git: @@ -100,7 +94,6 @@ name: python-grizzly-bitrot-jobs branch: 'stable/grizzly' branch-name: '-grizzly' - email: openstack-stable-maint@lists.openstack.org node: precise jobs: - 'periodic-{name}-python26{branch-name}' @@ -112,7 +105,6 @@ name: python-havana-bitrot-jobs branch: 'stable/havana' branch-name: '-havana' - email: openstack-stable-maint@lists.openstack.org node: precise jobs: - 'periodic-{name}-python26{branch-name}' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index b5ae1a3ab4..1427a1e51f 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -103,6 +103,42 @@ pipelines: timer: - time: '0 6 * * *' + - name: periodic-grizzly + description: Periodic checks of the stable/grizzly branches. + manager: IndependentPipelineManager + precedence: low + trigger: + timer: + - time: '0 6 * * *' + failure: + smtp: + from: jenkins@openstack.org + to: openstack-stable-maint@lists.openstack.org + + - name: periodic-havana + description: Periodic checks of the stable/havana branches. + manager: IndependentPipelineManager + precedence: low + trigger: + timer: + - time: '0 6 * * *' + failure: + smtp: + from: jenkins@openstack.org + to: openstack-stable-maint@lists.openstack.org + + - name: periodic-qa + description: Periodic jobs for the QA team. + manager: IndependentPipelineManager + precedence: low + trigger: + timer: + - time: '0 6 * * *' + failure: + smtp: + from: jenkins@openstack.org + to: openstack-qa@lists.openstack.org + project-templates: - name: python-jobs @@ -120,6 +156,18 @@ project-templates: - '{name}-branch-tarball' - '{name}-coverage' + - name: periodic-grizzly + periodic-grizzly: + - 'periodic-{name}-docs-grizzly' + - 'periodic-{name}-python26-grizzly' + - 'periodic-{name}-python27-grizzly' + + - name: periodic-havana + periodic-havana: + - 'periodic-{name}-docs-havana' + - 'periodic-{name}-python26-havana' + - 'periodic-{name}-python27-havana' + jobs: - name: ^.*$ @@ -671,6 +719,8 @@ projects: - name: openstack/cinder template: - name: python-jobs + - name: periodic-grizzly + - name: periodic-havana check: - gate-cinder-requirements - gate-cinder-pylint @@ -702,12 +752,6 @@ projects: - cinder-merge-release-tags periodic: - cinder-propose-translation-update - - periodic-cinder-docs-grizzly - - periodic-cinder-python26-grizzly - - periodic-cinder-python27-grizzly - - periodic-cinder-docs-havana - - periodic-cinder-python26-havana - - periodic-cinder-python27-havana - name: openstack/gantt template: @@ -748,6 +792,8 @@ projects: - name: openstack/glance template: - name: python-jobs + - name: periodic-grizzly + - name: periodic-havana check: - gate-glance-requirements - check-tempest-dsvm-full @@ -777,16 +823,12 @@ projects: - glance-merge-release-tags periodic: - glance-propose-translation-update - - periodic-glance-docs-grizzly - - periodic-glance-python26-grizzly - - periodic-glance-python27-grizzly - - periodic-glance-docs-havana - - periodic-glance-python26-havana - - periodic-glance-python27-havana - name: openstack/horizon template: - name: python-jobs + - name: periodic-grizzly + - name: periodic-havana check: - gate-horizon-requirements - gate-horizon-python27-django14 @@ -818,13 +860,6 @@ projects: - horizon-tarball - horizon-docs - horizon-merge-release-tags - periodic: - - periodic-horizon-docs-grizzly - - periodic-horizon-python26-grizzly - - periodic-horizon-python27-grizzly - - periodic-horizon-docs-havana - - periodic-horizon-python26-havana - - periodic-horizon-python27-havana - name: openstack/django_openstack_auth template: @@ -843,6 +878,8 @@ projects: - name: openstack/keystone template: - name: python-jobs + - name: periodic-grizzly + - name: periodic-havana check: - gate-keystone-requirements - check-tempest-dsvm-full @@ -875,17 +912,13 @@ projects: - keystone-merge-release-tags periodic: - keystone-propose-translation-update - - periodic-keystone-docs-grizzly - - periodic-keystone-python26-grizzly - - periodic-keystone-python27-grizzly - - periodic-keystone-docs-havana - - periodic-keystone-python26-havana - - periodic-keystone-python27-havana - periodic-swift-dsvm-functional-havana - name: openstack/nova template: - name: python-jobs + - name: periodic-grizzly + - name: periodic-havana check: - gate-nova-requirements - check-tempest-dsvm-full @@ -921,12 +954,6 @@ projects: - nova-merge-release-tags periodic: - nova-propose-translation-update - - periodic-nova-docs-grizzly - - periodic-nova-python26-grizzly - - periodic-nova-python27-grizzly - - periodic-nova-docs-havana - - periodic-nova-python26-havana - - periodic-nova-python27-havana - name: openstack/openstack check: @@ -1081,6 +1108,8 @@ projects: - name: openstack/neutron template: - name: python-jobs + - name: periodic-grizzly + - name: periodic-havana check: - gate-neutron-requirements - check-tempest-dsvm-neutron @@ -1113,12 +1142,6 @@ projects: - neutron-merge-release-tags periodic: - neutron-propose-translation-update - - periodic-neutron-docs-grizzly - - periodic-neutron-python26-grizzly - - periodic-neutron-python27-grizzly - - periodic-neutron-docs-havana - - periodic-neutron-python26-havana - - periodic-neutron-python27-havana - name: openstack/swift template: @@ -1697,13 +1720,15 @@ projects: post: - tempest-docs - tempest-branch-tarball - periodic: + periodic-grizzly: - periodic-tempest-dsvm-full-grizzly - periodic-tempest-dsvm-neutron-grizzly - periodic-tempest-dsvm-postgres-full-grizzly + periodic-havana: - periodic-tempest-dsvm-full-havana - periodic-tempest-dsvm-neutron-havana - periodic-tempest-dsvm-postgres-full-havana + periodic-qa: - periodic-tempest-dsvm-all-havana - periodic-tempest-dsvm-stress-havana - periodic-tempest-dsvm-neutron-pg-havana @@ -1713,6 +1738,8 @@ projects: - name: openstack/ceilometer template: - name: python-jobs + - name: periodic-grizzly + - name: periodic-havana check: - gate-ceilometer-requirements - check-tempest-dsvm-full @@ -1740,12 +1767,6 @@ projects: - ceilometer-merge-release-tags periodic: - ceilometer-propose-translation-update - - periodic-ceilometer-docs-grizzly - - periodic-ceilometer-python26-grizzly - - periodic-ceilometer-python27-grizzly - - periodic-ceilometer-docs-havana - - periodic-ceilometer-python26-havana - - periodic-ceilometer-python27-havana - name: stackforge/clouddocs-maven-plugin check: @@ -1870,6 +1891,8 @@ projects: - name: openstack/heat template: - name: python-jobs + - name: periodic-grizzly + - name: periodic-havana check: - gate-heat-requirements - check-tempest-dsvm-full @@ -1896,12 +1919,6 @@ projects: - heat-docs - heat-merge-release-tags periodic: - - periodic-heat-docs-grizzly - - periodic-heat-python26-grizzly - - periodic-heat-python27-grizzly - - periodic-heat-docs-havana - - periodic-heat-python26-havana - - periodic-heat-python27-havana - heat-propose-translation-update #TODO: add docs