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
Merge "Make sysstat script more readable"
[releng/global-jjb.git]
/
.jjb-test
/
expected-xml
/
gerrit-maven-maven-clm-master
diff --git
a/.jjb-test/expected-xml/gerrit-maven-maven-clm-master
b/.jjb-test/expected-xml/gerrit-maven-maven-clm-master
index
c193455
..
c9ad3ca
100644
(file)
--- a/
.jjb-test/expected-xml/gerrit-maven-maven-clm-master
+++ b/
.jjb-test/expected-xml/gerrit-maven-maven-clm-master
@@
-102,6
+102,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>
@@
-310,9
+315,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.
@@
-534,7
+539,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>