From d8a98d25474d46eef78e4ecae3b86e014ed1d5d8 Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
Date: Wed, 17 Jun 2020 09:42:49 -0700
Subject: [PATCH] combine 'ws' and 'work space' pattern since Jenkins requires
 them to be non-empty

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

diff --git a/job_templates/snippet/publisher_warnings_ng.xml.em b/job_templates/snippet/publisher_warnings_ng.xml.em
index 83a0063b9..b50eba652 100644
--- a/job_templates/snippet/publisher_warnings_ng.xml.em
+++ b/job_templates/snippet/publisher_warnings_ng.xml.em
@@ -1,49 +1,47 @@
 <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>@(workspace)/log/build_*/*/stdout_stderr.log</pattern>
+      <pattern>*/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>@(workspace)/log/build_*/*/stdout_stderr.log</pattern>
+      <pattern>*/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>@(workspace)/log/build_*/*/stdout_stderr.log</pattern>
+      <pattern>*/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>@(workspace)/log/build_*/*/stdout_stderr.log</pattern>
+      <pattern>*/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>@(workspace)/log/build_*/*/stdout_stderr.log</pattern>
+      <pattern>*/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 for]@
+@[end if]@
   </analysisTools>
   <sourceCodeEncoding></sourceCodeEncoding>
   <sourceDirectory></sourceDirectory>