commit b55b703ea065f783c6045a024fda48d9f1902ab8
author Chris McDonald <cjmcdonald@chromium.org> Thu Jun 17 16:41:32 2021 -0600
committer Commit Bot <commit-bot@chromium.org> Fri Jul 16 23:53:37 2021 +0000
tree 0460088cc95ef64cf29472c5156679b269286471
parent d4bdef217e97b8233ef8c56a647c36e1efdf6a8d

cbuildbot: Move Buildbot printing functions to `cbuildbot_alerts` module

Move all of the cbuildbot-specific printing routines out of cros_logging
and in to a new submodule of cbuildbot. Fix up all usages of these
functions to point to the new location.

BUG=b:191490453
TEST=`run_tests`

Change-Id: I5f5f28256b89d2b0500c1c404e2718f33aceaa31
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2973409
Tested-by: Chris McDonald <cjmcdonald@chromium.org>
Commit-Queue: Chris McDonald <cjmcdonald@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_mark_android_as_stable.py

diff --git a/scripts/cros_mark_android_as_stable.py b/scripts/cros_mark_android_as_stable.py
index ad78c2b..3034710 100644
--- a/scripts/cros_mark_android_as_stable.py
+++ b/scripts/cros_mark_android_as_stable.py
@@ -20,12 +20,13 @@
 import filecmp
 import glob
 import json
+import logging
 import os
 
-from chromite.lib import constants
+from chromite.cbuildbot import cbuildbot_alerts
 from chromite.lib import commandline
+from chromite.lib import constants
 from chromite.lib import cros_build_lib
-from chromite.lib import cros_logging as logging
 from chromite.lib import git
 from chromite.lib import gs
 from chromite.lib import osutils
@@ -102,10 +103,10 @@
     ab_link = ('https://android-build.googleplex.com'
                '/builds/%s/branches/%s/cls?end=%s'
                % (new_android, build_branch, old_android))
-    logging.PrintBuildbotLink('Android changelog', ab_link)
+    cbuildbot_alerts.PrintBuildbotLink('Android changelog', ab_link)
 
-  logging.PrintBuildbotStepText(msg)
-  logging.PrintKitchenSetBuildProperty('android_uprev', json.dumps({
+  cbuildbot_alerts.PrintBuildbotStepText(msg)
+  cbuildbot_alerts.PrintKitchenSetBuildProperty('android_uprev', json.dumps({
       'branch': build_branch,
       'new': new_ebuild.version,
       'old': stable_candidate.version,
@@ -274,7 +275,7 @@
   if IsTheNewEBuildRedundant(new_ebuild, stable_candidate):
     msg = 'Previous ebuild with same version found and ebuild is redundant.'
     logging.info(msg)
-    logging.PrintBuildbotStepText('%s %s not revved'
+    cbuildbot_alerts.PrintBuildbotStepText('%s %s not revved'
                                   % (stable_candidate.pkgname,
                                      stable_candidate.version))
     osutils.SafeUnlink(new_ebuild_path)
@@ -358,7 +359,7 @@
 
 
 def main(argv):
-  logging.EnableBuildbotMarkers()
+  cbuildbot_alerts.EnableBuildbotMarkers()
   parser = GetParser()
   options = parser.parse_args(argv)
   options.Freeze()