From: Aric Gardner <agardner@linuxfoundation.org>
Date: Fri, 20 Feb 2015 18:58:18 +0000 (-0500)
Subject: This should make merge and verify jobs work
X-Git-Tag: arno.2015.1.0~187
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=88f2c41cbca09b80674b37f17937c9703c2add7d;p=releng.git

This should make merge and verify jobs work

"sed -i -Ee 's,\ \-t,,g' docker/runcontext" -this removes the tty
allocation, which was breaking the build as jenkins does not have a tty

Change-Id: Ia405e566be20405deb50d7a66b7f6ab0c60bf706
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
---

diff --git a/jjb/genesis/genesis.yml b/jjb/genesis/genesis.yml
index cf0f4b562..59514f381 100644
--- a/jjb/genesis/genesis.yml
+++ b/jjb/genesis/genesis.yml
@@ -117,13 +117,20 @@
 
     builders:
         - shell: |
-            echo foo
-            echo bar
             hostname
-            ls -la
+            whoami
             docker --version
-
-
+            cd fuel-build/docker
+            pwd
+            echo foo
+            make clean || true
+            make
+            cd ..
+            echo foo
+            make clean || true
+            sed -i -Ee 's,\ \-t,,g' docker/runcontext
+            make all
+  
 - job-template:
     name: 'genesis-merge'
 
@@ -179,9 +186,11 @@
             docker --version
             cd fuel-build/docker
             pwd
-            make clean
+            echo foo
+            make clean || true
             make
             cd ..
-            sed -i -Ee 's,docker\ run,docker run --privileged=true --rm -i -e HOME=$HOME -u $USER -w $PWD -v ${HOME}/.ssh:${HOME}/.ssh -v $GITROOT:$GITROOT $CID "$@",' docker/runcontext
-            make clean
+            echo foo
+            make clean || true
+            sed -i -Ee 's,\ \-t,,g' docker/runcontext
             make all