X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgithub-ciman-packer-merge-ubuntu1604-mininet;h=1bd65add61783ef15e3fa871ef779de76fe5a8d1;hb=743eab353a2412ea2b52d7555bf50b1f95041ba3;hp=1fce814af7b29caefaae6fce9f8820f8ebfbe8d6;hpb=dd452eb375a1bfc85a84fb9a7950879ea5fda926;p=releng%2Fglobal-jjb.git diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet index 1fce814a..1bd65add 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet @@ -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 @@ -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=mininet -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.