X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=.jjb-test%2Fexpected-xml%2Fgithub-maven-sonar;h=c0c8c2a91d43ad7a9757f3968e90525cb97c3834;hb=refs%2Fchanges%2F88%2F8388%2F3;hp=017819b145983b602ede900cfbc7bcee68cdf612;hpb=5a5524c53ec347a3230c34f29a963d87c685f37d;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/github-maven-sonar b/.jjb-test/expected-xml/github-maven-sonar
index 017819b1..c0c8c2a9 100644
--- a/.jjb-test/expected-xml/github-maven-sonar
+++ b/.jjb-test/expected-xml/github-maven-sonar
@@ -10,8 +10,9 @@
build-vm
false
-
+
$GIT_URL/$PROJECT/example-org/releng/ciman
+
@@ -95,13 +96,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
+
@@ -117,31 +126,25 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
- **
+ $sha1
-
-
false
- false
- true
- false
false
Default
-
- true
-
- false
- false
+
+
+
false
true
false
+ false
10
@@ -155,8 +158,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
false
+
+
^recheck$
+
false
true
true
@@ -185,9 +191,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
@@ -256,7 +260,7 @@ $MVN clean deploy \
--global-settings "$GLOBAL_SETTINGS_FILE" \
--settings "$SETTINGS_FILE" \
-DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
- $MAVEN_PARAMS $MAVEN_OPTIONS
+ $MAVEN_OPTIONS $MAVEN_PARAMS
# Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
# shellcheck disable=SC2086
@@ -265,7 +269,7 @@ $MVN $SONAR_MAVEN_GOAL \
--global-settings "$GLOBAL_SETTINGS_FILE" \
--settings "$SETTINGS_FILE" \
-DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
- $MAVEN_PARAMS $MAVEN_OPTIONS
+ $MAVEN_OPTIONS $MAVEN_PARAMS
@@ -285,11 +289,11 @@ exit 0
-
+
**/**.exec
**/classes
**/src/main/java
-
+ false
**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**
10
@@ -364,9 +368,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.