From b6e4070e214e3345ec26615a7bf2495faf3f46af Mon Sep 17 00:00:00 2001
From: Robert Tomczyk <robert.tomczyk@est.tech>
Date: Wed, 23 Mar 2022 12:47:28 +0000
Subject: [PATCH] Revert "Fix infra merge jjb job."

This reverts commit d746d14a6cdbb288b6c47a4f72bc9ff5302975dc.

Reason for revert: Let's try to fix slack publisher instead

Change-Id: I8c348fc68bc600d94f44663f7127d0bc6812182f
---
 jjb/geode/apache-geode-test-coordinator.yaml     | 16 ++++++++--------
 .../global-template-apache-geode-build.yaml      | 16 ++++++++--------
 jjb/geode/global-template-apache-geode-test.yaml | 14 +++++++-------
 jjb/global/jjb-macros.yaml                       |  1 +
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/jjb/geode/apache-geode-test-coordinator.yaml b/jjb/geode/apache-geode-test-coordinator.yaml
index a6cfb480..abcb5328 100644
--- a/jjb/geode/apache-geode-test-coordinator.yaml
+++ b/jjb/geode/apache-geode-test-coordinator.yaml
@@ -1,7 +1,7 @@
 ---
 #
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2018-2022 Nordix Foundation.
+#  Copyright (C) 2018-2019 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -144,10 +144,10 @@
               node-parameters: true
               enable-condition: "$PUBLISH_GEODE == true"
 
-    # publishers:
-    #   - notify-slack:
-    #       slack-channel: '#geode-ci'
-    #       notify-start: true
-    #       notify-success: true
-    #       notify-failure: true
-    #       notify-back-to-normal: true
+    publishers:
+      - notify-slack:
+          slack-channel: '#geode-ci'
+          notify-start: true
+          notify-success: true
+          notify-failure: true
+          notify-back-to-normal: true
diff --git a/jjb/geode/global-template-apache-geode-build.yaml b/jjb/geode/global-template-apache-geode-build.yaml
index 3d66cf27..65217c47 100644
--- a/jjb/geode/global-template-apache-geode-build.yaml
+++ b/jjb/geode/global-template-apache-geode-build.yaml
@@ -1,7 +1,7 @@
 ---
 #
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2018-2022 Nordix Foundation.
+#  Copyright (C) 2018-2019 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -80,10 +80,10 @@
     builders:
       - '{build-executor}'
 
-    # publishers:
-    #   - notify-slack:
-    #       slack-channel: '#geode-ci'
-    #       notify-start: true
-    #       notify-success: true
-    #       notify-failure: true
-    #       notify-back-to-normal: true
+    publishers:
+      - notify-slack:
+          slack-channel: '#geode-ci'
+          notify-start: true
+          notify-success: true
+          notify-failure: true
+          notify-back-to-normal: true
diff --git a/jjb/geode/global-template-apache-geode-test.yaml b/jjb/geode/global-template-apache-geode-test.yaml
index fcf293e6..a1167fee 100644
--- a/jjb/geode/global-template-apache-geode-test.yaml
+++ b/jjb/geode/global-template-apache-geode-test.yaml
@@ -1,7 +1,7 @@
 ---
 #
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2018-2022 Nordix Foundation.
+#  Copyright (C) 2018-2019 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -89,9 +89,9 @@
           keep-all: false
           allow-missing: true
           link-to-last-build: false
-      # - notify-slack:
-      #     slack-channel: '#geode-ci'
-      #     notify-start: true
-      #     notify-success: true
-      #     notify-failure: true
-      #     notify-back-to-normal: true
+      - notify-slack:
+          slack-channel: '#geode-ci'
+          notify-start: true
+          notify-success: true
+          notify-failure: true
+          notify-back-to-normal: true
diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index b8536525..efc6a50f 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -494,6 +494,7 @@
     publishers:
       - slack:
           room: '{slack-channel}'
+          team-domain: 'estech-group'
           notify-start: '{notify-start}'
           notify-success: '{notify-success}'
           notify-failure: '{notify-failure}'
-- 
2.25.1