Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Allow SONAR_MAVEN_GOAL to be configurable
[releng/global-jjb.git]
/
.jjb-test
/
expected-xml
/
github-maven-maven-clm-master
diff --git
a/.jjb-test/expected-xml/github-maven-maven-clm-master
b/.jjb-test/expected-xml/github-maven-maven-clm-master
index
a22d038
..
d93f761
100644
(file)
--- a/
.jjb-test/expected-xml/github-maven-maven-clm-master
+++ b/
.jjb-test/expected-xml/github-maven-maven-clm-master
@@
-97,6
+97,11
@@
For example '<1.0.0' or '>=1.0.0,<2.0.0'.
</description>
<defaultValue>uuddlrlrba</defaultValue>
</hudson.model.StringParameterDefinition>
</description>
<defaultValue>uuddlrlrba</defaultValue>
</hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>ARCHIVE_ARTIFACTS</name>
+ <description>Artifacts to archive to the logs server.</description>
+ <defaultValue/>
+ </hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
@@
-105,14
+110,14
@@
For example '<1.0.0' or '>=1.0.0,<2.0.0'.
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
<name>origin</name>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
<name>origin</name>
- <refspec
>+refs/pull/*:refs/remotes/origin/pr/*</refspec
>
+ <refspec
/
>
<url>git@github.com:example-org/releng/ciman</url>
<credentialsId>test-credential</credentialsId>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
<url>git@github.com:example-org/releng/ciman</url>
<credentialsId>test-credential</credentialsId>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>
**
</name>
+ <name>
refs/heads/master
</name>
</hudson.plugins.git.BranchSpec>
</branches>
<excludedUsers/>
</hudson.plugins.git.BranchSpec>
</branches>
<excludedUsers/>
@@
-305,9
+310,9
@@
SAR_DIR="$WORKSPACE/archives/sar-reports"
mkdir -p "$SAR_DIR"
cp "$SYSSTAT_PATH/"* "$_"
# convert sar data to ascii format
mkdir -p "$SAR_DIR"
cp "$SYSSTAT_PATH/"* "$_"
# convert sar data to ascii format
-while IFS="" read -r s
+while IFS="" read -r s
arfilenum
do
do
- [ -f "$s
" ] && LC_TIME=POSIX sar -A -f "$s" > "$SAR_DIR/sar${s
//[!0-9]/}"
+ [ -f "$s
arfilenum" ] && 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.
done < <(find "$SYSSTAT_PATH" -name "sa[0-9]*" || true)
# DON'T fail build if script fails.
@@
-529,7
+534,7
@@
rm ~/.netrc
<buildWrappers>
<com.michelin.cio.hudson.plugins.maskpasswords.MaskPasswordsBuildWrapper/>
<hudson.plugins.build__timeout.BuildTimeoutWrapper>
<buildWrappers>
<com.michelin.cio.hudson.plugins.maskpasswords.MaskPasswordsBuildWrapper/>
<hudson.plugins.build__timeout.BuildTimeoutWrapper>
- <timeoutMinutes>
15
</timeoutMinutes>
+ <timeoutMinutes>
30
</timeoutMinutes>
<timeoutEnvVar>BUILD_TIMEOUT</timeoutEnvVar>
<failBuild>true</failBuild>
<writingDescription>false</writingDescription>
<timeoutEnvVar>BUILD_TIMEOUT</timeoutEnvVar>
<failBuild>true</failBuild>
<writingDescription>false</writingDescription>