aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-09 17:59:53 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-09 18:12:46 +0200
commit008be0a29cbc2697585bc5a867a19123eba688c8 (patch)
tree03b98192ef971ad1634d8b2faea76f445f4d2ee2
parent146d348fcf233c8f6500495bc77dcf4d3dbfc59a (diff)
ci/{build,deploy}.sh: Use /bin/sh, vt220
This should fix Jenkins build log warns like: <tput: unknown terminal "unknown">, and also NOT print color chars. Fixes: ARMBAND-136 Change-Id: If65f6bf3df5323374aefba56d0c9b7ca4f91e5ca Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--Makefile2
-rwxr-xr-xci/build.sh2
-rwxr-xr-xci/deploy.sh2
3 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 8300711..b563440 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,8 @@
# - Fuel@OPNFV is made aware of an Armband type build by passing
# the "ARMBAND_BASE" env var;
+SHELL = /bin/sh
+
export ARMBAND_BASE := $(shell pwd)
export OPNFV_GIT_SHA := $(shell git rev-parse HEAD)
export REVSTATE
diff --git a/ci/build.sh b/ci/build.sh
index 0b46a7d..6809589 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -7,6 +7,8 @@
set -e
+export TERM="vt220"
+
SCRIPT_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
BUILD_BASE=$(readlink -e ${SCRIPT_DIR}/../upstream/fuel/build)
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 179b168..dbaf203 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -9,6 +9,8 @@
#
set -e
+export TERM="vt220"
+
cd $WORKSPACE
make patches-import