From 008be0a29cbc2697585bc5a867a19123eba688c8 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 9 Oct 2016 17:59:53 +0200 Subject: ci/{build,deploy}.sh: Use /bin/sh, vt220 This should fix Jenkins build log warns like: , and also NOT print color chars. Fixes: ARMBAND-136 Change-Id: If65f6bf3df5323374aefba56d0c9b7ca4f91e5ca Signed-off-by: Alexandru Avadanii --- Makefile | 2 ++ ci/build.sh | 2 ++ ci/deploy.sh | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 8300711d..b563440d 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 0b46a7d7..6809589b 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 179b168f..dbaf203b 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -9,6 +9,8 @@ # set -e +export TERM="vt220" + cd $WORKSPACE make patches-import -- cgit 1.2.3-korg