commit 0b8b7ba401663c9260622a39fae2ca23756914ad
author Wanda Mora <morawand@chromium.org> Tue Jul 21 20:31:29 2020 +0000
committer Commit Bot <commit-bot@chromium.org> Wed Jul 29 16:28:16 2020 +0000
tree a59bea64339dc99da644657b22e1f1fa121c230b
parent 2e5c88b85ef94018944c482098f6bcaff1498241

cvetriager: cl generator: CL link capture fix

The bin/ script now logs the CL links to corresponding successful
patches to a kernel. This change also includes a fix in do_push, where
the output of the push is captured.

BUG=chromium:1093363
TEST=python setup.py test

Change-Id: Idb62c65c1ce2eb88e3553da66181f9d47b790d79
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2311189
Reviewed-by: Zubin Mithra <zsm@chromium.org>
Commit-Queue: Wanda Mora <morawand@chromium.org>
Tested-by: Wanda Mora <morawand@chromium.org>

contrib/cvetriager/bin/triage

diff --git a/contrib/cvetriager/bin/triage b/contrib/cvetriager/bin/triage
index 58bf547..6c38889 100644
--- a/contrib/cvetriager/bin/triage
+++ b/contrib/cvetriager/bin/triage
@@ -104,7 +104,9 @@
 
         if len(patched_kernels) != 0:
             logger.info(f'Generating CLs for {commit}')
-            clgenerator.create_cls(opts.bug, patched_kernels)
+            cl_links = clgenerator.create_cls(opts.bug, patched_kernels)
+            for kernel in cl_links:
+                logger.info(f'{kernel} CL Link: {cl_links[kernel]}')
 
     if opts.json:
         json_out = json.dumps(commit_status, indent=4)

contrib/cvetriager/cvelib/clgenerator.py

diff --git a/contrib/cvetriager/cvelib/clgenerator.py b/contrib/cvetriager/cvelib/clgenerator.py
index e75a33c..730b092 100644
--- a/contrib/cvetriager/cvelib/clgenerator.py
+++ b/contrib/cvetriager/cvelib/clgenerator.py
@@ -49,8 +49,8 @@
 def do_push(push_cmd, kernel, kernel_path):
     """Pushes to branch."""
     try:
-        output = subprocess.check_output(push_cmd.split(' '), stderr=subprocess.DEVNULL,
-                                         cwd=kernel_path)
+        output = subprocess.check_output(push_cmd.split(' '), stderr=subprocess.STDOUT,
+                                         cwd=kernel_path, encoding='utf-8')
     except subprocess.CalledProcessError:
         raise CLGeneratorException(f'{kernel} repository needs to be refreshed before pushing.')