commit a3603b494e9e0e646ca483b8290ef40d876656c9
author chnyda <chnyda@mirantis.com> Fri Jun 02 12:36:08 2017 +0200
committer chnyda <chnyda@mirantis.com> Fri Jun 02 12:36:08 2017 +0200
tree 2f1d3dd1786085338fb13d85686fb6e8e054266e
parent 8ad962e85b2af3b5d5defdbaa8c8980e62a6077c

use bash -c in container instead of sh

Change-Id: Ifb727611fc25be22a0dee310a8de14153d9d099e

src/com/mirantis/mk/Debian.groovy

diff --git a/src/com/mirantis/mk/Debian.groovy b/src/com/mirantis/mk/Debian.groovy
index 9f3bd66..1c9285a 100644
--- a/src/com/mirantis/mk/Debian.groovy
+++ b/src/com/mirantis/mk/Debian.groovy
@@ -33,7 +33,7 @@
     def workspace = common.getWorkspace()
 
     img.inside("-u root:root" ) {
-        sh("""cd ${workspace} && (which eatmydata || (apt-get update && apt-get install -y eatmydata)) &&
+        sh("""bash -c 'cd ${workspace} && (which eatmydata || (apt-get update && apt-get install -y eatmydata)) &&
             export LD_LIBRARY_PATH=\${LD_LIBRARY_PATH:+"\$LD_LIBRARY_PATH:"}/usr/lib/libeatmydata &&
             export LD_PRELOAD=\${LD_PRELOAD:+"\$LD_PRELOAD "}libeatmydata.so &&
             [[ -z "${extraRepoUrl}" && "${extraRepoUrl}" != "null" ]] || echo "${extraRepoUrl}" >/etc/apt/sources.list.d/extra.list &&
@@ -47,7 +47,7 @@
             [ ! -f pre_build_script.sh ] || bash ./pre_build_script.sh &&
             sudo -H -E -u jenkins dpkg-source -x ${file} build-area/${pkg} && cd build-area/${pkg} &&
             mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes -y" -i debian/control
-            sudo -H -E -u jenkins debuild --no-lintian -uc -us -b""")
+            sudo -H -E -u jenkins debuild --no-lintian -uc -us -b'""")
     }
 
 
@@ -124,7 +124,7 @@
     img.inside("-u root:root") {
 
         withEnv(["DEBIAN_FRONTEND=noninteractive", "DEBFULLNAME='${gitName}'", "DEBEMAIL='${gitEmail}'"]) {
-            sh("""cd ${workspace} && (which eatmydata || (apt-get update && apt-get install -y eatmydata)) &&
+            sh("""bash -c 'cd ${workspace} && (which eatmydata || (apt-get update && apt-get install -y eatmydata)) &&
             export LD_LIBRARY_PATH=\${LD_LIBRARY_PATH:+"\$LD_LIBRARY_PATH:"}/usr/lib/libeatmydata &&
             export LD_PRELOAD=\${LD_PRELOAD:+"\$LD_PRELOAD "}libeatmydata.so &&
             apt-get update && apt-get install -y build-essential git-buildpackage dpkg-dev sudo &&
@@ -153,7 +153,7 @@
                 sudo -H -E -u jenkins git add -u debian/changelog &&
                 sudo -H -E -u jenkins git commit -m "New snapshot version \$NEW_VERSION"
             ) &&
-            sudo -H -E -u jenkins gbp buildpackage -nc --git-force-create --git-notify=false --git-ignore-branch --git-ignore-new --git-verbose --git-export-dir=../build-area -sa -S -uc -us """)            
+            sudo -H -E -u jenkins gbp buildpackage -nc --git-force-create --git-notify=false --git-ignore-branch --git-ignore-new --git-verbose --git-export-dir=../build-area -sa -S -uc -us '""")
         }
     }
 }