X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-maven-sonar;h=cf178aa407a2db2c938988f13427ffffdd9d4b4f;hb=5ffdf16ad97cb83038320301062221c990f283c8;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..cf178aa4 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'.
STAGING_PROFILE_ID
Nexus staging profile ID.
- uuddlrlrba
+
ARCHIVE_ARTIFACTS
Artifacts to archive to the logs server.
+
+ SONAR_MAVEN_GOAL
+ 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 "org.codehaus.mojo:sonar-maven-plugin:3.3.0.603:sonar".
+
+ sonar:sonar
+
@@ -220,9 +228,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
- SONAR_HOST_URL=$SONAR_URL
-SONAR_MAVEN_GOAL=sonar:sonar
-
+ SONAR_HOST_URL=$SONAR_URL
@@ -399,9 +405,9 @@ SAR_DIR="$WORKSPACE/archives/sar-reports"
mkdir -p "$SAR_DIR"
cp "$SYSSTAT_PATH/"* "$_"
# convert sar data to ascii format
-while IFS="" read -r s
+while IFS="" read -r sarfilenum
do
- [ -f "$s" ] && LC_TIME=POSIX sar -A -f "$s" > "$SAR_DIR/sar${s//[!0-9]/}"
+ [ -f "$sarfilenum" ] && LC_TIME=POSIX sar -A -f "$sarfilenum" > "$SAR_DIR/sar${sarfilenum//[!0-9]/}"
done < <(find "$SYSSTAT_PATH" -name "sa[0-9]*" || true)
# DON'T fail build if script fails.