[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/, buildbot_gentoo_ci/reporters/

[Magnus Granberg]

commit:     d6008c0cba2239c0ba2c243a2d51b7f9285593c5
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 00:41:53 2022 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 00:41:53 2022 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=d6008c0c

use notice for channel msg

Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org>

 buildbot_gentoo_ci/config/reporters.py | 8 ++++----
 buildbot_gentoo_ci/reporters/irc.py    | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/buildbot_gentoo_ci/config/reporters.py b/buildbot_gentoo_ci/config/reporters.py
index 44edeab..1bfb70f 100644
--- a/buildbot_gentoo_ci/config/reporters.py
+++ b/buildbot_gentoo_ci/config/reporters.py
@@ -7,7 +7,7 @@ from buildbot.reporters.message import MessageFormatter
 
 from buildbot_gentoo_ci.reporters import irc
 irc_template = '''{% set resultsList = ["\x0303SUCCESS", "\x0308WARNINGS", "\x0304FAILURE"] %}\
-Buildbot: {{ "\x02" }}{{ build['properties']['cpv'][0] }}{{ "\x02" }} {{ "\x0303" }}repo/{{ projects }}{{ "\x03" }} \
+{{ "\x02" }}{{ build['properties']['cpv'][0] }}{{ "\x02" }} {{ "\x0303" }}repo/{{ projects }}{{ "\x03" }} \
 {{ build['properties']['revision'][0]|truncate(10, True) }} {{ "\x0302" }}{{ build['properties']['owners'][0][0] }}{{ "\x03" }} \
 {{ build['properties']['project_data'][0]['name'] }} \
 {{ "\x02" }}{{ "Build: "}}{{ resultsList[build['results']] }}{{ "\x03" }}{{ "\x02" }} {{ "\x0312" }}{{ build_url }}{{ "\x03" }}\
@@ -22,7 +22,6 @@ def ircGenerators():
     ]
     mode = [
         'failing',
-        'passing',
         'warnings',
     ]
     return [
@@ -34,10 +33,11 @@ def ircGenerators():
     ]
 #FIXME:
 # server, nick channel should be set in config
-irc_reporter = irc.IRCStatusPush("irc.freenode.net", "gentoo_ci_test",
+irc_reporter = irc.IRCStatusPush("irc.libera.chat", "gci_test",
                  channels=[{"channel": "#gentoo-ci"},
                         ],
-                 generators=ircGenerators()
+                 generators=ircGenerators(),
+                 noticeOnChannel=True
                  )
 
 def gentoo_reporters(r=[]):

diff --git a/buildbot_gentoo_ci/reporters/irc.py b/buildbot_gentoo_ci/reporters/irc.py
index 6e0bc6b..b60ad3a 100644
--- a/buildbot_gentoo_ci/reporters/irc.py
+++ b/buildbot_gentoo_ci/reporters/irc.py
@@ -139,8 +139,8 @@ class IRCStatusPush(ReporterBase):
                                   self.join_channels, self.pm_to_nicks,
                                   self.authz, self.tags,
                                   self.notify_events, parent=self,
-                                  noticeOnChannel=noticeOnChannel,
-                                  useRevisions=useRevisions,
+                                  noticeOnChannel=self.noticeOnChannel,
+                                  useRevisions=self.useRevisions,
                                   showBlameList=showBlameList,
                                   lostDelay=lostDelay,
                                   failedDelay=failedDelay,
@@ -170,4 +170,7 @@ class IRCStatusPush(ReporterBase):
             if isinstance(c, dict):
                 channel = c.get('channel', None)
                 print(channel)
-                self.f.p.msg(channel, assembleFormattedText(A.normal[body]))
+                if self.noticeOnChannel:
+                    self.f.p.notice(channel, assembleFormattedText(A.normal[body]))
+                else:
+                    self.f.p.msg(channel, assembleFormattedText(A.normal[body]))