Merge branch 'ibmi' of https://github.com/ThePrez/build into ibmi

Author: ThePrez

ansible/roles/baselayout/vars/main.yml

@@ -57,23 +57,8 @@ packages: {
     'bash,cmake,gcc-c++,gcc6-c++,tar,unzip,git,make,sudo',
   ],
 
-  # @jgorzins - this works, but @rvagg says doing it as a concatenated string
-  # as above is _significantly_ faster to execute
   ibmi: [
-    'autoconf',
-    'automake',
-    'ca-certificates-mozilla',
-    'ccache',
-    'coreutils-gnu',
-    'gcc',
-    'gcc-cplusplus',
-    'gcc-cpp',
-    'git',
-    'libstdcplusplus-devel',
-    'openssl-devel',
-    'python2-pip',
-    'sed-gnu',
-    'zlib-devel',
+    'autoconf,automake,ca-certificates-mozilla,ccache,cmake,coreutils-gnu,gcc,gcc-cplusplus,gcc-cpp,git,libstdcplusplus-devel,m4-gnu,openssl-devel,python2-pip,sed-gnu,zlib-devel',
   ],
 
   debian7: [

ansible/roles/jenkins-worker/templates/ibmi_start.j2

@@ -4,7 +4,7 @@ SBMJOB_OPTS="JOB($CIJOBNAME) USER(IOJS)"
 
 export PATH=/QOpenSys/pkgs/lib/ccache:/QOpenSys/pkgs/bin:/QOpenSys/usr/bin:/usr/ccs/bin:/QOpenSys/usr/bin/X11:/usr/sbin:.:/usr/bin
 export PASE_PATH=$PATH
-export JENKS_HOME={{ home }}/{{ server_user }}
+export HOME={{ home }}/{{ server_user }}
 export NODE_COMMON_PIPE="$HOME/test.pipe"
 export NODE_TEST_DIR="$HOME/tmp"
 export JOBS=4
@@ -23,4 +23,4 @@ export START_CMD="{{ java_path[os] }} -Xmx{{ server_ram|default('128m') }} -Dos4
 
 echo $START_CMD
 
-exec /QOpenSys/usr/bin/system -v -kpiveO "SBMJOB CMD(QSH CMD('echo starting Jenkins slave && cd $JENKS_HOME && env && exec $START_CMD')) CPYENVVAR(*YES) PRTDEV(*USRPRF) ALWMLTTHD(*YES) $SBMJOB_OPTS"
+exec /QOpenSys/usr/bin/system -v -kpiveO "SBMJOB CMD(QSH CMD('echo starting Jenkins slave && cd $HOME && env && exec $START_CMD')) CPYENVVAR(*YES) PRTDEV(*USRPRF) ALWMLTTHD(*YES) $SBMJOB_OPTS"