diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2015-02-20 13:58:18 -0500 |
|---|---|---|
| committer | Aric Gardner <agardner@linuxfoundation.org> | 2015-02-20 13:58:18 -0500 |
| commit | 88f2c41cbca09b80674b37f17937c9703c2add7d (patch) | |
| tree | c8a9ede9fc6742d8a1cb29d5ae45f481b17a465b | |
| parent | 6a50a2ecedce22f637c948aea9908d352777e270 (diff) | |
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>
| -rw-r--r-- | jjb/genesis/genesis.yml | 25 |
1 files changed, 17 insertions, 8 deletions
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 |