X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-maven-sonar;h=8acf0492d1c8bb5cdd63f9af6cf0bd8099676c02;hb=c238d5307c09b13e356bdb83379f4060f933b3a4;hp=f7bebc636b8dd564dbd26591bcda200b24848bca;hpb=ddeccf5a8df0fe4478eae61099c0cd3084d02e64;p=releng%2Fglobal-jjb.git

diff --git a/.jjb-test/expected-xml/gerrit-maven-sonar b/.jjb-test/expected-xml/gerrit-maven-sonar
index f7bebc63..8acf0492 100644
--- a/.jjb-test/expected-xml/gerrit-maven-sonar
+++ b/.jjb-test/expected-xml/gerrit-maven-sonar
@@ -100,13 +100,21 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
           <name>STAGING_PROFILE_ID</name>
           <description>Nexus staging profile ID.
 </description>
-          <defaultValue>uuddlrlrba</defaultValue>
+          <defaultValue/>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>ARCHIVE_ARTIFACTS</name>
           <description>Artifacts to archive to the logs server.</description>
           <defaultValue/>
         </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>SONAR_MAVEN_GOAL</name>
+          <description>Maven goals to pass to the Sonar call. Typically sonar:sonar
+however to use a specific version of the sonar-maven-plugin we
+can call &quot;org.codehaus.mojo:sonar-maven-plugin:3.3.0.603:sonar&quot;.
+</description>
+          <defaultValue>sonar:sonar</defaultValue>
+        </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
   </properties>
@@ -220,9 +228,7 @@ For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
     </hudson.tasks.Shell>
     <EnvInjectBuilder>
       <info>
-        <propertiesContent>SONAR_HOST_URL=$SONAR_URL
-SONAR_MAVEN_GOAL=sonar:sonar
-</propertiesContent>
+        <propertiesContent>SONAR_HOST_URL=$SONAR_URL</propertiesContent>
       </info>
     </EnvInjectBuilder>
     <org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep plugin="config-file-provider">
@@ -291,7 +297,7 @@ $MVN clean deploy \
     --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
     --settings &quot;$SETTINGS_FILE&quot; \
     -DaltDeploymentRepository=staging::default::file:&quot;$WORKSPACE&quot;/m2repo \
-    $MAVEN_PARAMS $MAVEN_OPTIONS
+    $MAVEN_OPTIONS $MAVEN_PARAMS
 
 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
 # shellcheck disable=SC2086
@@ -300,7 +306,7 @@ $MVN $SONAR_MAVEN_GOAL \
     --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
     --settings &quot;$SETTINGS_FILE&quot; \
     -DaltDeploymentRepository=staging::default::file:&quot;$WORKSPACE&quot;/m2repo \
-    $MAVEN_PARAMS $MAVEN_OPTIONS
+    $MAVEN_OPTIONS $MAVEN_PARAMS
 </command>
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
@@ -399,9 +405,9 @@ SAR_DIR=&quot;$WORKSPACE/archives/sar-reports&quot;
 mkdir -p &quot;$SAR_DIR&quot;
 cp &quot;$SYSSTAT_PATH/&quot;* &quot;$_&quot;
 # convert sar data to ascii format
-while IFS=&quot;&quot; read -r s
+while IFS=&quot;&quot; read -r sarfilenum
 do
-    [ -f &quot;$s&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$s&quot; &gt; &quot;$SAR_DIR/sar${s//[!0-9]/}&quot;
+    [ -f &quot;$sarfilenum&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$sarfilenum&quot; &gt; &quot;$SAR_DIR/sar${sarfilenum//[!0-9]/}&quot;
 done &lt; &lt;(find &quot;$SYSSTAT_PATH&quot; -name &quot;sa[0-9]*&quot; || true)
 
 # DON'T fail build if script fails.