prune inadvertent glog/klog to stdout

jenkinsci · Jun 6, 2019 · 38a5207 · 38a5207
1 parent b95a842
commit 38a5207
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/com/openshift/jenkins/plugins/pipeline/OcAction.java b/src/main/java/com/openshift/jenkins/plugins/pipeline/OcAction.java
@@ -177,7 +177,13 @@ protected OcActionResult run() throws IOException, InterruptedException, Executi
             final StringBuffer stderr = new StringBuffer();
             ClientCommandRunner runner = new ClientCommandRunner(command, filePath, envVars,
                     line -> { // got a line from stdout
-                        stdout.append(line).append('\n');
+                        // some of the k8s klog's like the cached_discovery.go V(3) logging ends up in StdOut
+                        // vs. StdErr; so we employ a simple filter to discern and send these to stderr instead
+                        if (line != null && line.contains(".go:")) {
+                            stderr.append(line).append('\n');
+                        } else {
+                            stdout.append(line).append('\n');
+                        }
                         printToConsole(line);
                         return false; // don't interrupt `oc`
                     },