Revert "Fix infra merge jjb job."

This reverts commit d746d14a6cdbb288b6c47a4f72bc9ff5302975dc.

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

Change-Id: I8c348fc68bc600d94f44663f7127d0bc6812182f

diff --git a/jjb/geode/apache-geode-test-coordinator.yaml b/jjb/geode/apache-geode-test-coordinator.yaml
index a6cfb4803d804543eabaff40f962303cc343f213..abcb532872345d00941d995d7b96beffdb834e64 100644 (file)
--- 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 3d66cf27a9e62ba96a2ae93151e87333ccd09872..65217c4723c989f65ed565765daf60c85e88a043 100644 (file)
--- 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 fcf293e66bad6ed8266dcf7b8442c0950fa7ade6..a1167fee0ede5f0d9e8f0b18a262905a87a54245 100644 (file)
--- 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 b85365255aefb9c425a0f165bd14d1ad249b0e57..efc6a50fa9e1215d2a5357fd55f1d626f9db765e 100644 (file)
--- 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}'