Merge "Make sysstat script more readable"

diff --combined .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
index e3885fd,6d516b8..7888a6c
--- 1/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
--- 2/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
@@@ -76,7 -76,7 +76,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.1.1</defaultValue>
 +          <defaultValue>1.1.3</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -205,7 -205,7 +205,7 @@@
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.1.1
 +        <propertiesContent>PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -226,7 -226,7 +226,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -315,7 -315,7 +315,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=centos
  PACKER_TEMPLATE=java-builder
 -PACKER_VERSION=1.1.1
 +PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -336,7 -336,7 +336,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -455,9 -455,9 +455,9 @@@ SAR_DIR=&quot;$WORKSPACE/archives/sar-r
  mkdir -p &quot;$SAR_DIR&quot;
  cp &quot;$SYSSTAT_PATH/&quot;* &quot;$_&quot;
  # convert sar data to ascii format
- while IFS=&quot;&quot; read -r s
+ while IFS=&quot;&quot; read -r sarfilenum
  do
-     [ -f &quot;$s&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$s&quot; &gt; &quot;$SAR_DIR/sar${s//[!0-9]/}&quot;
+     [ -f &quot;$sarfilenum&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$sarfilenum&quot; &gt; &quot;$SAR_DIR/sar${sarfilenum//[!0-9]/}&quot;
  done &lt; &lt;(find &quot;$SYSSTAT_PATH&quot; -name &quot;sa[0-9]*&quot; || true)
  
  # DON'T fail build if script fails.

diff --combined .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
index 9fe02a3,dc944c5..10091bf
--- 1/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
--- 2/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
@@@ -76,7 -76,7 +76,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.1.1</defaultValue>
 +          <defaultValue>1.1.3</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -205,7 -205,7 +205,7 @@@
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.1.1
 +        <propertiesContent>PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -226,7 -226,7 +226,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -315,7 -315,7 +315,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=centos
  PACKER_TEMPLATE=mininet
 -PACKER_VERSION=1.1.1
 +PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -336,7 -336,7 +336,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -455,9 -455,9 +455,9 @@@ SAR_DIR=&quot;$WORKSPACE/archives/sar-r
  mkdir -p &quot;$SAR_DIR&quot;
  cp &quot;$SYSSTAT_PATH/&quot;* &quot;$_&quot;
  # convert sar data to ascii format
- while IFS=&quot;&quot; read -r s
+ while IFS=&quot;&quot; read -r sarfilenum
  do
-     [ -f &quot;$s&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$s&quot; &gt; &quot;$SAR_DIR/sar${s//[!0-9]/}&quot;
+     [ -f &quot;$sarfilenum&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$sarfilenum&quot; &gt; &quot;$SAR_DIR/sar${sarfilenum//[!0-9]/}&quot;
  done &lt; &lt;(find &quot;$SYSSTAT_PATH&quot; -name &quot;sa[0-9]*&quot; || true)
  
  # DON'T fail build if script fails.

diff --combined .jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
index 782f672,012fac5..2aff753
--- 1/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
--- 2/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
@@@ -76,7 -76,7 +76,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.1.1</defaultValue>
 +          <defaultValue>1.1.3</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -205,7 -205,7 +205,7 @@@
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.1.1
 +        <propertiesContent>PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -226,7 -226,7 +226,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -315,7 -315,7 +315,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=ubuntu1604
  PACKER_TEMPLATE=java-builder
 -PACKER_VERSION=1.1.1
 +PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -336,7 -336,7 +336,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -455,9 -455,9 +455,9 @@@ SAR_DIR=&quot;$WORKSPACE/archives/sar-r
  mkdir -p &quot;$SAR_DIR&quot;
  cp &quot;$SYSSTAT_PATH/&quot;* &quot;$_&quot;
  # convert sar data to ascii format
- while IFS=&quot;&quot; read -r s
+ while IFS=&quot;&quot; read -r sarfilenum
  do
-     [ -f &quot;$s&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$s&quot; &gt; &quot;$SAR_DIR/sar${s//[!0-9]/}&quot;
+     [ -f &quot;$sarfilenum&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$sarfilenum&quot; &gt; &quot;$SAR_DIR/sar${sarfilenum//[!0-9]/}&quot;
  done &lt; &lt;(find &quot;$SYSSTAT_PATH&quot; -name &quot;sa[0-9]*&quot; || true)
  
  # DON'T fail build if script fails.

diff --combined .jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
index 85bbb12,1a13f60..63f727c
--- 1/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
--- 2/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
@@@ -76,7 -76,7 +76,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.1.1</defaultValue>
 +          <defaultValue>1.1.3</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -205,7 -205,7 +205,7 @@@
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.1.1
 +        <propertiesContent>PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -226,7 -226,7 +226,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -315,7 -315,7 +315,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=ubuntu1604
  PACKER_TEMPLATE=mininet
 -PACKER_VERSION=1.1.1
 +PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -336,7 -336,7 +336,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -455,9 -455,9 +455,9 @@@ SAR_DIR=&quot;$WORKSPACE/archives/sar-r
  mkdir -p &quot;$SAR_DIR&quot;
  cp &quot;$SYSSTAT_PATH/&quot;* &quot;$_&quot;
  # convert sar data to ascii format
- while IFS=&quot;&quot; read -r s
+ while IFS=&quot;&quot; read -r sarfilenum
  do
-     [ -f &quot;$s&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$s&quot; &gt; &quot;$SAR_DIR/sar${s//[!0-9]/}&quot;
+     [ -f &quot;$sarfilenum&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$sarfilenum&quot; &gt; &quot;$SAR_DIR/sar${sarfilenum//[!0-9]/}&quot;
  done &lt; &lt;(find &quot;$SYSSTAT_PATH&quot; -name &quot;sa[0-9]*&quot; || true)
  
  # DON'T fail build if script fails.

diff --combined .jjb-test/expected-xml/gerrit-ciman-packer-verify
index e335e16,0f23f89..deaa51a
--- 1/.jjb-test/expected-xml/gerrit-ciman-packer-verify
--- 2/.jjb-test/expected-xml/gerrit-ciman-packer-verify
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-verify
@@@ -76,7 -76,7 +76,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.1.1</defaultValue>
 +          <defaultValue>1.1.3</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -207,7 -207,7 +207,7 @@@
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.1.1
 +        <propertiesContent>PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -228,7 -228,7 +228,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -345,9 -345,9 +345,9 @@@ SAR_DIR=&quot;$WORKSPACE/archives/sar-r
  mkdir -p &quot;$SAR_DIR&quot;
  cp &quot;$SYSSTAT_PATH/&quot;* &quot;$_&quot;
  # convert sar data to ascii format
- while IFS=&quot;&quot; read -r s
+ while IFS=&quot;&quot; read -r sarfilenum
  do
-     [ -f &quot;$s&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$s&quot; &gt; &quot;$SAR_DIR/sar${s//[!0-9]/}&quot;
+     [ -f &quot;$sarfilenum&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$sarfilenum&quot; &gt; &quot;$SAR_DIR/sar${sarfilenum//[!0-9]/}&quot;
  done &lt; &lt;(find &quot;$SYSSTAT_PATH&quot; -name &quot;sa[0-9]*&quot; || true)
  
  # DON'T fail build if script fails.

diff --combined .jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
index 0a65181,89f55ac..7463d75
--- 1/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
--- 2/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
@@@ -71,7 -71,7 +71,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.1.1</defaultValue>
 +          <defaultValue>1.1.3</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -163,7 -163,7 +163,7 @@@ zxiiro</whitelist
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.1.1
 +        <propertiesContent>PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -184,7 -184,7 +184,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -273,7 -273,7 +273,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=centos
  PACKER_TEMPLATE=java-builder
 -PACKER_VERSION=1.1.1
 +PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -294,7 -294,7 +294,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -413,9 -413,9 +413,9 @@@ SAR_DIR=&quot;$WORKSPACE/archives/sar-r
  mkdir -p &quot;$SAR_DIR&quot;
  cp &quot;$SYSSTAT_PATH/&quot;* &quot;$_&quot;
  # convert sar data to ascii format
- while IFS=&quot;&quot; read -r s
+ while IFS=&quot;&quot; read -r sarfilenum
  do
-     [ -f &quot;$s&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$s&quot; &gt; &quot;$SAR_DIR/sar${s//[!0-9]/}&quot;
+     [ -f &quot;$sarfilenum&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$sarfilenum&quot; &gt; &quot;$SAR_DIR/sar${sarfilenum//[!0-9]/}&quot;
  done &lt; &lt;(find &quot;$SYSSTAT_PATH&quot; -name &quot;sa[0-9]*&quot; || true)
  
  # DON'T fail build if script fails.

diff --combined .jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
index 5a8ad3f,d0cd4db..a9fbdcc
--- 1/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
--- 2/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
@@@ -71,7 -71,7 +71,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.1.1</defaultValue>
 +          <defaultValue>1.1.3</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -163,7 -163,7 +163,7 @@@ zxiiro</whitelist
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.1.1
 +        <propertiesContent>PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -184,7 -184,7 +184,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -273,7 -273,7 +273,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=centos
  PACKER_TEMPLATE=mininet
 -PACKER_VERSION=1.1.1
 +PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -294,7 -294,7 +294,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -413,9 -413,9 +413,9 @@@ SAR_DIR=&quot;$WORKSPACE/archives/sar-r
  mkdir -p &quot;$SAR_DIR&quot;
  cp &quot;$SYSSTAT_PATH/&quot;* &quot;$_&quot;
  # convert sar data to ascii format
- while IFS=&quot;&quot; read -r s
+ while IFS=&quot;&quot; read -r sarfilenum
  do
-     [ -f &quot;$s&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$s&quot; &gt; &quot;$SAR_DIR/sar${s//[!0-9]/}&quot;
+     [ -f &quot;$sarfilenum&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$sarfilenum&quot; &gt; &quot;$SAR_DIR/sar${sarfilenum//[!0-9]/}&quot;
  done &lt; &lt;(find &quot;$SYSSTAT_PATH&quot; -name &quot;sa[0-9]*&quot; || true)
  
  # DON'T fail build if script fails.

diff --combined .jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
index dde8933,f50f950..35b4aaa
--- 1/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
--- 2/.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 +71,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.1.1</defaultValue>
 +          <defaultValue>1.1.3</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -163,7 -163,7 +163,7 @@@ zxiiro</whitelist
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.1.1
 +        <propertiesContent>PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -184,7 -184,7 +184,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -273,7 -273,7 +273,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=ubuntu1604
  PACKER_TEMPLATE=java-builder
 -PACKER_VERSION=1.1.1
 +PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -294,7 -294,7 +294,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -413,9 -413,9 +413,9 @@@ SAR_DIR=&quot;$WORKSPACE/archives/sar-r
  mkdir -p &quot;$SAR_DIR&quot;
  cp &quot;$SYSSTAT_PATH/&quot;* &quot;$_&quot;
  # convert sar data to ascii format
- while IFS=&quot;&quot; read -r s
+ while IFS=&quot;&quot; read -r sarfilenum
  do
-     [ -f &quot;$s&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$s&quot; &gt; &quot;$SAR_DIR/sar${s//[!0-9]/}&quot;
+     [ -f &quot;$sarfilenum&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$sarfilenum&quot; &gt; &quot;$SAR_DIR/sar${sarfilenum//[!0-9]/}&quot;
  done &lt; &lt;(find &quot;$SYSSTAT_PATH&quot; -name &quot;sa[0-9]*&quot; || true)
  
  # DON'T fail build if script fails.

diff --combined .jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
index d15b25a,ad77ab4..1bd65ad
--- 1/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
--- 2/.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 +71,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.1.1</defaultValue>
 +          <defaultValue>1.1.3</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -163,7 -163,7 +163,7 @@@ zxiiro</whitelist
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.1.1
 +        <propertiesContent>PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -184,7 -184,7 +184,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -273,7 -273,7 +273,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=ubuntu1604
  PACKER_TEMPLATE=mininet
 -PACKER_VERSION=1.1.1
 +PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -294,7 -294,7 +294,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -413,9 -413,9 +413,9 @@@ SAR_DIR=&quot;$WORKSPACE/archives/sar-r
  mkdir -p &quot;$SAR_DIR&quot;
  cp &quot;$SYSSTAT_PATH/&quot;* &quot;$_&quot;
  # convert sar data to ascii format
- while IFS=&quot;&quot; read -r s
+ while IFS=&quot;&quot; read -r sarfilenum
  do
-     [ -f &quot;$s&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$s&quot; &gt; &quot;$SAR_DIR/sar${s//[!0-9]/}&quot;
+     [ -f &quot;$sarfilenum&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$sarfilenum&quot; &gt; &quot;$SAR_DIR/sar${sarfilenum//[!0-9]/}&quot;
  done &lt; &lt;(find &quot;$SYSSTAT_PATH&quot; -name &quot;sa[0-9]*&quot; || true)
  
  # DON'T fail build if script fails.

diff --combined .jjb-test/expected-xml/github-ciman-packer-verify
index 4c8caa4,1d6d7a6..532b24b
--- 1/.jjb-test/expected-xml/github-ciman-packer-verify
--- 2/.jjb-test/expected-xml/github-ciman-packer-verify
+++ b/.jjb-test/expected-xml/github-ciman-packer-verify
@@@ -71,7 -71,7 +71,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.1.1</defaultValue>
 +          <defaultValue>1.1.3</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -151,7 -151,7 +151,7 @@@
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.1.1
 +        <propertiesContent>PACKER_VERSION=1.1.3
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -172,7 -172,7 +172,7 @@@ echo &quot;---&gt; packer-install.sh&qu
  
  # $PACKER_VERSION        : Define a packer version passed as job paramter
  
 -PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 +PACKER_VERSION=&quot;${PACKER_VERSION:-1.1.3}&quot;
  
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
@@@ -289,9 -289,9 +289,9 @@@ SAR_DIR=&quot;$WORKSPACE/archives/sar-r
  mkdir -p &quot;$SAR_DIR&quot;
  cp &quot;$SYSSTAT_PATH/&quot;* &quot;$_&quot;
  # convert sar data to ascii format
- while IFS=&quot;&quot; read -r s
+ while IFS=&quot;&quot; read -r sarfilenum
  do
-     [ -f &quot;$s&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$s&quot; &gt; &quot;$SAR_DIR/sar${s//[!0-9]/}&quot;
+     [ -f &quot;$sarfilenum&quot; ] &amp;&amp; LC_TIME=POSIX sar -A -f &quot;$sarfilenum&quot; &gt; &quot;$SAR_DIR/sar${sarfilenum//[!0-9]/}&quot;
  done &lt; &lt;(find &quot;$SYSSTAT_PATH&quot; -name &quot;sa[0-9]*&quot; || true)
  
  # DON'T fail build if script fails.