X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=.jjb-test%2Fexpected-xml%2Fgithub-maven-maven-release-master;h=42487ad8cc3a0b4249397ffc299e0c7c3b0c99fc;hb=refs%2Fchanges%2F94%2F8394%2F1;hp=169f1adaf90c405014b11c5d974971d894478e76;hpb=dd452eb375a1bfc85a84fb9a7950879ea5fda926;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/github-maven-maven-release-master b/.jjb-test/expected-xml/github-maven-maven-release-master
index 169f1ada..42487ad8 100644
--- a/.jjb-test/expected-xml/github-maven-maven-release-master
+++ b/.jjb-test/expected-xml/github-maven-maven-release-master
@@ -10,8 +10,9 @@
build-vm
false
-
+
$GIT_URL/$PROJECT/example-org/releng/ciman
+
@@ -117,31 +118,25 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
- refs/heads/master
+ master
-
-
false
- false
- true
- false
false
Default
-
- true
-
- false
- false
+
+
+
false
true
false
+ false
10
@@ -158,8 +153,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
false
+
+
^build release$
+
true
true
true
@@ -402,7 +400,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
#!/bin/bash
# SPDX-License-Identifier: EPL-1.0
@@ -492,9 +490,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.