From ecf3c5dfda83d39d1aff5af96247c85f575a6b3c Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
Date: Tue, 16 Jun 2020 10:00:43 -0700
Subject: [PATCH 1/3] read stdout_stderr.log from latest build to extract CMake
 / compiler warnings

Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
---
 job_templates/snippet/publisher_warnings_ng.xml.em | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/job_templates/snippet/publisher_warnings_ng.xml.em b/job_templates/snippet/publisher_warnings_ng.xml.em
index d6c4bc395..798264f29 100644
--- a/job_templates/snippet/publisher_warnings_ng.xml.em
+++ b/job_templates/snippet/publisher_warnings_ng.xml.em
@@ -3,7 +3,7 @@
     <io.jenkins.plugins.analysis.warnings.Cmake>
       <id></id>
       <name></name>
-      <pattern></pattern>
+      <pattern>ws/log/latest_build/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.Cmake>
@@ -11,7 +11,7 @@
    <io.jenkins.plugins.analysis.warnings.Gcc4>
       <id></id>
       <name></name>
-      <pattern></pattern>
+      <pattern>ws/log/latest_build/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.Gcc4>
@@ -20,14 +20,14 @@
     <io.jenkins.plugins.analysis.warnings.Clang>
       <id></id>
       <name></name>
-      <pattern></pattern>
+      <pattern>ws/log/latest_build/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.Clang>
     <io.jenkins.plugins.analysis.warnings.ClangTidy>
       <id></id>
       <name></name>
-      <pattern></pattern>
+      <pattern>ws/log/latest_build/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.ClangTidy>
@@ -35,7 +35,7 @@
     <io.jenkins.plugins.analysis.warnings.MsBuild>
       <id></id>
       <name></name>
-      <pattern></pattern>
+      <pattern>ws/log/latest_build/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.MsBuild>

From 82d098f37b0709a667bcb5ef21d0b64e255819bd Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
Date: Tue, 16 Jun 2020 11:52:36 -0700
Subject: [PATCH 2/3] use all build log directories, even if there is only one
 atm

Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
---
 job_templates/snippet/publisher_warnings_ng.xml.em | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/job_templates/snippet/publisher_warnings_ng.xml.em b/job_templates/snippet/publisher_warnings_ng.xml.em
index 798264f29..0b75018a1 100644
--- a/job_templates/snippet/publisher_warnings_ng.xml.em
+++ b/job_templates/snippet/publisher_warnings_ng.xml.em
@@ -3,7 +3,7 @@
     <io.jenkins.plugins.analysis.warnings.Cmake>
       <id></id>
       <name></name>
-      <pattern>ws/log/latest_build/*/stdout_stderr.log</pattern>
+      <pattern>ws/log/build_*/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.Cmake>
@@ -11,7 +11,7 @@
    <io.jenkins.plugins.analysis.warnings.Gcc4>
       <id></id>
       <name></name>
-      <pattern>ws/log/latest_build/*/stdout_stderr.log</pattern>
+      <pattern>ws/log/build_*/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.Gcc4>
@@ -20,14 +20,14 @@
     <io.jenkins.plugins.analysis.warnings.Clang>
       <id></id>
       <name></name>
-      <pattern>ws/log/latest_build/*/stdout_stderr.log</pattern>
+      <pattern>ws/log/build_*/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.Clang>
     <io.jenkins.plugins.analysis.warnings.ClangTidy>
       <id></id>
       <name></name>
-      <pattern>ws/log/latest_build/*/stdout_stderr.log</pattern>
+      <pattern>ws/log/build_*/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.ClangTidy>
@@ -35,7 +35,7 @@
     <io.jenkins.plugins.analysis.warnings.MsBuild>
       <id></id>
       <name></name>
-      <pattern>ws/log/latest_build/*/stdout_stderr.log</pattern>
+      <pattern>ws/log/build_*/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.MsBuild>

From d34af4808b1dd06f19ec2ceb9dcac7efac626a99 Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
Date: Tue, 16 Jun 2020 13:49:45 -0700
Subject: [PATCH 3/3] also handle 'work space'

Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
---
 .../snippet/publisher_warnings_ng.xml.em      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/job_templates/snippet/publisher_warnings_ng.xml.em b/job_templates/snippet/publisher_warnings_ng.xml.em
index 0b75018a1..83a0063b9 100644
--- a/job_templates/snippet/publisher_warnings_ng.xml.em
+++ b/job_templates/snippet/publisher_warnings_ng.xml.em
@@ -1,47 +1,49 @@
 <io.jenkins.plugins.analysis.core.steps.IssuesRecorder plugin="warnings-ng@@7.3.0">
   <analysisTools>
+@[for workspace in ['ws', 'work space']]@
     <io.jenkins.plugins.analysis.warnings.Cmake>
       <id></id>
       <name></name>
-      <pattern>ws/log/build_*/*/stdout_stderr.log</pattern>
+      <pattern>@(workspace)/log/build_*/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.Cmake>
-@[if os_name in ['linux', 'linux-armhf', 'linux-aarch64', 'linux-centos']]@
+@[  if os_name in ['linux', 'linux-armhf', 'linux-aarch64', 'linux-centos']]@
    <io.jenkins.plugins.analysis.warnings.Gcc4>
       <id></id>
       <name></name>
-      <pattern>ws/log/build_*/*/stdout_stderr.log</pattern>
+      <pattern>@(workspace)/log/build_*/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.Gcc4>
-@[end if]
-@[if os_name in ['osx', 'linux', 'linux-armhf', 'linux-aarch64', 'linux-centos']]@
+@[  end if]
+@[  if os_name in ['osx', 'linux', 'linux-armhf', 'linux-aarch64', 'linux-centos']]@
     <io.jenkins.plugins.analysis.warnings.Clang>
       <id></id>
       <name></name>
-      <pattern>ws/log/build_*/*/stdout_stderr.log</pattern>
+      <pattern>@(workspace)/log/build_*/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.Clang>
     <io.jenkins.plugins.analysis.warnings.ClangTidy>
       <id></id>
       <name></name>
-      <pattern>ws/log/build_*/*/stdout_stderr.log</pattern>
+      <pattern>@(workspace)/log/build_*/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.ClangTidy>
-@[elif os_name in ['windows', 'windows-metal']]@
+@[  elif os_name in ['windows', 'windows-metal']]@
     <io.jenkins.plugins.analysis.warnings.MsBuild>
       <id></id>
       <name></name>
-      <pattern>ws/log/build_*/*/stdout_stderr.log</pattern>
+      <pattern>@(workspace)/log/build_*/*/stdout_stderr.log</pattern>
       <reportEncoding></reportEncoding>
       <skipSymbolicLinks>false</skipSymbolicLinks>
     </io.jenkins.plugins.analysis.warnings.MsBuild>
-@[else]@
+@[  else]@
 @{assert False, 'Unknown os_name: ' + os_name}@
-@[end if]@
+@[  end if]@
+@[end for]@
   </analysisTools>
   <sourceCodeEncoding></sourceCodeEncoding>
   <sourceDirectory></sourceDirectory>