From c8dcf1c591156a27f450e52dbfc039c5ab4849aa Mon Sep 17 00:00:00 2001 From: "robert.tomczyk" Date: Thu, 25 Jul 2019 20:30:29 +0100 Subject: [PATCH] INFRA: Update the slack options for projects Below changes are introduced: - Push upstream slack notification are removed. The job failures should be handled as part of the Gerrit review by a person who is trying to push the change to upstream. - Introduce slack notifications for Geode jobs to #geode Slack channel. Change-Id: Ie625ed4bc667b4268f6ab8d1d967561873ed1c2b --- jjb/acumos/global-templates-acumos-push-upstream.yaml | 4 ---- jjb/acumos/global-templates-acumos-rebase.yaml | 4 ++++ jjb/geode/apache-geode-test-coordinator.yaml | 10 +++++++++- jjb/geode/global-template-apache-geode-build.yaml | 10 +++++++--- jjb/geode/global-template-apache-geode-test.yaml | 10 ++++++---- jjb/global/global-templates-push-upstream.yaml | 4 ---- jjb/global/global-templates-rebase.yaml | 4 ++++ jjb/global/jjb-macros.yaml | 6 ++++-- jjb/onap/global-templates-onap-push-upstream.yaml | 4 ---- jjb/onap/global-templates-onap-rebase.yaml | 4 ++++ .../global-templates-opendaylight-push-upstream.yaml | 4 ---- .../global-templates-opendaylight-rebase.yaml | 4 ++++ .../global-templates-opendev-push-upstream.yaml | 4 ---- jjb/opendev/global-templates-opendev-rebase.yaml | 4 ++++ 14 files changed, 46 insertions(+), 30 deletions(-) diff --git a/jjb/acumos/global-templates-acumos-push-upstream.yaml b/jjb/acumos/global-templates-acumos-push-upstream.yaml index 34e11a60..541eb1c5 100644 --- a/jjb/acumos/global-templates-acumos-push-upstream.yaml +++ b/jjb/acumos/global-templates-acumos-push-upstream.yaml @@ -38,7 +38,3 @@ builders: - shell: !include-raw-escape: ./push-upstream-jobs.sh - - publishers: - - notify-slack: - slack-channel: '#infra' diff --git a/jjb/acumos/global-templates-acumos-rebase.yaml b/jjb/acumos/global-templates-acumos-rebase.yaml index 5ae2c88f..3d33b2fb 100644 --- a/jjb/acumos/global-templates-acumos-rebase.yaml +++ b/jjb/acumos/global-templates-acumos-rebase.yaml @@ -47,3 +47,7 @@ publishers: - notify-slack: slack-channel: '#infra' + notify-start: false + notify-success: false + notify-failure: true + notify-back-to-normal: true diff --git a/jjb/geode/apache-geode-test-coordinator.yaml b/jjb/geode/apache-geode-test-coordinator.yaml index c0bbd8ae..87d7313b 100644 --- a/jjb/geode/apache-geode-test-coordinator.yaml +++ b/jjb/geode/apache-geode-test-coordinator.yaml @@ -128,4 +128,12 @@ current-parameters: true git-revision: true abort-all-job: true - node-parameters: true \ No newline at end of file + node-parameters: true + + publishers: + - notify-slack: + slack-channel: '#geode' + notify-start: true + notify-success: true + notify-failure: true + notify-back-to-normal: true \ No newline at end of file diff --git a/jjb/geode/global-template-apache-geode-build.yaml b/jjb/geode/global-template-apache-geode-build.yaml index 0f559f96..a78b074a 100644 --- a/jjb/geode/global-template-apache-geode-build.yaml +++ b/jjb/geode/global-template-apache-geode-build.yaml @@ -74,6 +74,10 @@ builders: - '{build-executor}' -# publishers: -# - notify-slack: -# slack-channel: '#geode' + publishers: + - notify-slack: + slack-channel: '#geode' + notify-start: true + notify-success: true + notify-failure: true + notify-back-to-normal: true \ No newline at end of file diff --git a/jjb/geode/global-template-apache-geode-test.yaml b/jjb/geode/global-template-apache-geode-test.yaml index d84c77ff..88b84c08 100644 --- a/jjb/geode/global-template-apache-geode-test.yaml +++ b/jjb/geode/global-template-apache-geode-test.yaml @@ -82,7 +82,9 @@ - workspace-cleanup: clean-if: - failure: false - -# publishers: -# - notify-slack: -# slack-channel: '#geode' + - notify-slack: + slack-channel: '#geode' + notify-start: true + notify-success: true + notify-failure: true + notify-back-to-normal: true diff --git a/jjb/global/global-templates-push-upstream.yaml b/jjb/global/global-templates-push-upstream.yaml index 5241119c..70048b91 100644 --- a/jjb/global/global-templates-push-upstream.yaml +++ b/jjb/global/global-templates-push-upstream.yaml @@ -37,7 +37,3 @@ builders: - shell: !include-raw-escape: ./push-upstream-jobs.sh - - publishers: - - notify-slack: - slack-channel: '#infra' diff --git a/jjb/global/global-templates-rebase.yaml b/jjb/global/global-templates-rebase.yaml index d463b62c..7ae7d228 100644 --- a/jjb/global/global-templates-rebase.yaml +++ b/jjb/global/global-templates-rebase.yaml @@ -46,3 +46,7 @@ publishers: - notify-slack: slack-channel: '#infra' + notify-start: false + notify-success: false + notify-failure: true + notify-back-to-normal: true diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml index b665ac7c..7f71596e 100644 --- a/jjb/global/jjb-macros.yaml +++ b/jjb/global/jjb-macros.yaml @@ -394,8 +394,10 @@ publishers: - slack: room: '{slack-channel}' - notify-failure: true - notify-back-to-normal: true + notify-start: '{notify-start}' + notify-success: '{notify-success}' + notify-failure: '{notify-failure}' + notify-back-to-normal: '{notify-back-to-normal}' # property to discard old builds - property: diff --git a/jjb/onap/global-templates-onap-push-upstream.yaml b/jjb/onap/global-templates-onap-push-upstream.yaml index 71069785..ab19211c 100644 --- a/jjb/onap/global-templates-onap-push-upstream.yaml +++ b/jjb/onap/global-templates-onap-push-upstream.yaml @@ -37,7 +37,3 @@ builders: - shell: !include-raw-escape: ./push-upstream-jobs.sh - - publishers: - - notify-slack: - slack-channel: '#infra' diff --git a/jjb/onap/global-templates-onap-rebase.yaml b/jjb/onap/global-templates-onap-rebase.yaml index 3ae17f9a..5345d745 100644 --- a/jjb/onap/global-templates-onap-rebase.yaml +++ b/jjb/onap/global-templates-onap-rebase.yaml @@ -46,3 +46,7 @@ publishers: - notify-slack: slack-channel: '#infra' + notify-start: false + notify-success: false + notify-failure: true + notify-back-to-normal: true diff --git a/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml b/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml index 63743d75..860247c6 100644 --- a/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml +++ b/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml @@ -38,7 +38,3 @@ builders: - shell: !include-raw-escape: ./push-upstream-jobs.sh - - publishers: - - notify-slack: - slack-channel: '#infra' diff --git a/jjb/opendaylight/global-templates-opendaylight-rebase.yaml b/jjb/opendaylight/global-templates-opendaylight-rebase.yaml index 1d3d403f..3c03959d 100644 --- a/jjb/opendaylight/global-templates-opendaylight-rebase.yaml +++ b/jjb/opendaylight/global-templates-opendaylight-rebase.yaml @@ -47,3 +47,7 @@ publishers: - notify-slack: slack-channel: '#infra' + notify-start: false + notify-success: false + notify-failure: true + notify-back-to-normal: true diff --git a/jjb/opendev/global-templates-opendev-push-upstream.yaml b/jjb/opendev/global-templates-opendev-push-upstream.yaml index 51733409..af374e4d 100644 --- a/jjb/opendev/global-templates-opendev-push-upstream.yaml +++ b/jjb/opendev/global-templates-opendev-push-upstream.yaml @@ -38,7 +38,3 @@ builders: - shell: !include-raw-escape: ./push-upstream-jobs.sh - - publishers: - - notify-slack: - slack-channel: '#infra' diff --git a/jjb/opendev/global-templates-opendev-rebase.yaml b/jjb/opendev/global-templates-opendev-rebase.yaml index 83e40d59..cadfefd5 100644 --- a/jjb/opendev/global-templates-opendev-rebase.yaml +++ b/jjb/opendev/global-templates-opendev-rebase.yaml @@ -47,3 +47,7 @@ publishers: - notify-slack: slack-channel: '#infra' + notify-start: false + notify-success: false + notify-failure: true + notify-back-to-normal: true -- 2.25.1