michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ci: use set -x for verbosity

Browse source 
set -v was too verbose, so change to -x and remove extra sourcing of
zephyr-env.sh.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2018-12-03 09:56:53 -05:00
commit d1bca4e056
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scripts/ci/run_ci.sh
View file

@ -17,16 +17,13 @@
# The script can be run locally using for exmaple: # The script can be run locally using for exmaple:
# ./scripts/ci/run_ci.sh -b master -r upstream -p # ./scripts/ci/run_ci.sh -b master -r upstream -p
set -v set -x
source zephyr-env.sh
SANITYCHECK_OPTIONS=" --inline-logs --enable-coverage -N" SANITYCHECK_OPTIONS=" --inline-logs --enable-coverage -N"
SANITYCHECK_OPTIONS_RETRY="${SANITYCHECK_OPTIONS} --only-failed --outdir=out-2nd-pass" SANITYCHECK_OPTIONS_RETRY="${SANITYCHECK_OPTIONS} --only-failed --outdir=out-2nd-pass"
SANITYCHECK_OPTIONS_RETRY_2="${SANITYCHECK_OPTIONS} --only-failed --outdir=out-3nd-pass" SANITYCHECK_OPTIONS_RETRY_2="${SANITYCHECK_OPTIONS} --only-failed --outdir=out-3nd-pass"
SANITYCHECK="${ZEPHYR_BASE}/scripts/sanitycheck" export BSIM_OUT_PATH="/opt/bsim/"
BSIM_OUT_PATH="/opt/bsim/" export BSIM_COMPONENTS_PATH="${BSIM_OUT_PATH}/components/"
BSIM_COMPONENTS_PATH="${BSIM_OUT_PATH}/components/"
BSIM_BT_TEST_RESULTS_FILE="./bsim_bt_out/bsim_results.xml" BSIM_BT_TEST_RESULTS_FILE="./bsim_bt_out/bsim_results.xml"
MATRIX_BUILDS=1 MATRIX_BUILDS=1
@ -86,6 +83,8 @@ if [ -n "$MAIN_CI" ]; then
COMMIT_RANGE=$REMOTE/${BRANCH}..HEAD COMMIT_RANGE=$REMOTE/${BRANCH}..HEAD
echo "Commit range:" ${COMMIT_RANGE} echo "Commit range:" ${COMMIT_RANGE}
fi fi
source zephyr-env.sh
SANITYCHECK="${ZEPHYR_BASE}/scripts/sanitycheck"
if [ -n "$PULL_REQUEST" ]; then if [ -n "$PULL_REQUEST" ]; then
git rebase $REMOTE/${BRANCH}; git rebase $REMOTE/${BRANCH};
fi fi
@ -135,6 +134,7 @@ function handle_compiler_cache() {
} }
function on_complete() { function on_complete() {
source zephyr-env.sh
if [ "$1" == "failure" ]; then if [ "$1" == "failure" ]; then
handle_compiler_cache handle_compiler_cache
fi fi
@ -142,7 +142,6 @@ function on_complete() {
rm -rf ccache $HOME/.cache/zephyr rm -rf ccache $HOME/.cache/zephyr
mkdir -p shippable/testresults mkdir -p shippable/testresults
mkdir -p shippable/codecoverage mkdir -p shippable/codecoverage
source zephyr-env.sh
if [ "$MATRIX" = "1" ]; then if [ "$MATRIX" = "1" ]; then
echo "Handle coverage data..." echo "Handle coverage data..."