From 6e2518e2640b1266197ab06095ad22a10b249502 Mon Sep 17 00:00:00 2001 From: Nikolay Starodubtsev Date: Wed, 13 Jul 2016 08:44:05 +0000 Subject: [PATCH] Revert "Improve heartbeat jobs" This reverts commit b09fa5e01afc872a10b7c31f555a8b3c951a3f4a. Change-Id: I270a41b7b036bc0781ce14f310b6c441429ebac3 --- .../config/puppet-ci/hiera/etc/config.yaml | 2 +- murano-ci/jenkins/jobs/murano_jobs.yaml | 14 ++------ murano-ci/zuul/layout.yaml | 35 ------------------- 3 files changed, 4 insertions(+), 47 deletions(-) diff --git a/murano-ci/config/puppet-ci/hiera/etc/config.yaml b/murano-ci/config/puppet-ci/hiera/etc/config.yaml index e1a9b0d8..1e0a1e0b 100644 --- a/murano-ci/config/puppet-ci/hiera/etc/config.yaml +++ b/murano-ci/config/puppet-ci/hiera/etc/config.yaml @@ -48,7 +48,7 @@ zuul: key: "" chain: "" smtp: - host: "127.0.0.1" + host: "murano-ci-tst.vm.mirantis.net" port: 25 from: "zuul@murano-ci-tst.vm.mirantis.net" to: "user@murano-ci-tst.vm.mirantis.net" diff --git a/murano-ci/jenkins/jobs/murano_jobs.yaml b/murano-ci/jenkins/jobs/murano_jobs.yaml index 2d7116bd..acee0df5 100755 --- a/murano-ci/jenkins/jobs/murano_jobs.yaml +++ b/murano-ci/jenkins/jobs/murano_jobs.yaml @@ -49,6 +49,9 @@ concurrent: true node: trusty-devstack-cz5608 || trusty-devstack-cz5680 + triggers: + - timed: "H */3 * * *" + parameters: - bool: name: KEEP_VM_ALIVE @@ -82,17 +85,6 @@ - archive-artifacts -- job-template: - name: 'pulse' - project-type: freestyle - defaults: global - description: "Pulse job to track zuul condition" - disabled: false - concurrent: true - node: trusty-devstack-cz5608 || trusty-devstack-cz5680 - properties: - - zeromq-event - - job-template: name: 'coverage-{name}-{distro}' project-type: freestyle diff --git a/murano-ci/zuul/layout.yaml b/murano-ci/zuul/layout.yaml index 3992b4ab..fb7dce36 100755 --- a/murano-ci/zuul/layout.yaml +++ b/murano-ci/zuul/layout.yaml @@ -31,54 +31,19 @@ pipelines: - event: ref-updated ref: ^(?!refs/).*$ - - name: heartbeat - manager: IndependentPipelineManager - trigger: - timer: - - time: '2 */3 * * * *' - failure: - smtp: - to: nstarodubtsev@mirantis.com, kzaitsev@mirantis.com, vryzhenkin@mirantis.com, mkarpin@mirantis.com - from: zuul@murano-ci.vm.mirantis.net - subject: '[murano][heartbeat] Heartbeat job failed' - - - name: pulse - manager: IndependentPipelineManager - trigger: - timer: - - time: '*/15 * * * * *' - success: - smtp: - to: nstarodubtsev@mirantis.com, mkarpin@mirantis.com - from: zuul@murano-ci.vm.mirantis.net - subject: '[murano][pulse] Pulse job succeed' - failure: - smtp: - to: nstarodubtsev@mirantis.com, mkarpin@mirantis.com - from: zuul@murano-ci.vm.mirantis.net - subject: '[murano][pulse] Pulse job failed' - projects: - name: openstack/murano check: - gate-murano-ubuntu post: - hook-murano-rtfd - heartbeat: - - heartbeat-murano-ubuntu - pulse: - - pulse - name: openstack/murano-dashboard check: - gate-murano-dashboard-ubuntu - heartbeat: - - heartbeat-murano-dashboard-ubuntu - name: openstack/murano-agent check: - gate-murano-agent-ubuntu #- gate-murano-agent-debian - heartbeat: - - heartbeat-murano-agent-ubuntu - name: openstack/python-muranoclient check: - gate-murano-client-ubuntu