X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=inline;f=.jjb-test%2Fexpected-xml%2Fgithub-ciman-packer-merge-ubuntu1604-java-builder;h=35b4aaa991e9c56292d95019c37d69e3e024df72;hb=1ca3e3af6f48583fb29513eb9494f60b43f947f1;hp=6fd70d1298ed9d2bee5f5f17db118ab067fd4ba9;hpb=9d3f891844ffaacec7ada4a22df0b3e95caadae4;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
index 6fd70d12..35b4aaa9 100644
--- a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
@@ -71,7 +71,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
PACKER_VERSION
Packer version to download and install.
- 1.1.1
+ 1.1.3
@@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
- master
+ refs/heads/master
@@ -163,7 +163,7 @@ zxiiro
- PACKER_VERSION=1.1.1
+ PACKER_VERSION=1.1.3
@@ -184,7 +184,7 @@ echo "---> packer-install.sh"
# $PACKER_VERSION : Define a packer version passed as job paramter
-PACKER_VERSION="${PACKER_VERSION:-1.0.2}"
+PACKER_VERSION="${PACKER_VERSION:-1.1.3}"
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
@@ -273,7 +273,7 @@ exit 0
PACKER_PLATFORM=ubuntu1604
PACKER_TEMPLATE=java-builder
-PACKER_VERSION=1.1.1
+PACKER_VERSION=1.1.3
@@ -294,7 +294,7 @@ echo "---> packer-install.sh"
# $PACKER_VERSION : Define a packer version passed as job paramter
-PACKER_VERSION="${PACKER_VERSION:-1.0.2}"
+PACKER_VERSION="${PACKER_VERSION:-1.1.3}"
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
@@ -413,9 +413,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.