From 2d580a833939dfed486b8159367deb8f5ae3d019 Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Thu, 15 Nov 2018 11:41:58 +0100 Subject: [PATCH] ci: Add missing option to control placement of BT tests results file Added a missing option in run_ci.sh to control the placement of the xml results file. (Before it was just propagated thru the enviroment) + Changed .shippable to use this option when callign it. Signed-off-by: Alberto Escolar Piedras --- .shippable.yml | 4 ++-- scripts/ci/run_ci.sh | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.shippable.yml b/.shippable.yml index aa08c99934d..a062540fe3e 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -35,9 +35,9 @@ build: - export CCACHE_DIR=${SHIPPABLE_BUILD_DIR}/ccache/.ccache - > if [ "$IS_PULL_REQUEST" = "true" ]; then - ./scripts/ci/run_ci.sh -b master -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS} -p; + ./scripts/ci/run_ci.sh -b master -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS} -B ${BSIM_BT_TEST_RESULTS_FILE} -p; else - ./scripts/ci/run_ci.sh -b master -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS}; + ./scripts/ci/run_ci.sh -b master -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS} -B ${BSIM_BT_TEST_RESULTS_FILE}; fi; - ccache -s on_failure: diff --git a/scripts/ci/run_ci.sh b/scripts/ci/run_ci.sh index fb8ffc3aa81..979f463b3c4 100755 --- a/scripts/ci/run_ci.sh +++ b/scripts/ci/run_ci.sh @@ -25,7 +25,7 @@ SANITYCHECK="${ZEPHYR_BASE}/scripts/sanitycheck" MATRIX_BUILDS=1 MATRIX=1 -while getopts ":pm:b:r:M:" opt; do +while getopts ":pm:b:B:r:M:" opt; do case $opt in p) echo "Testing a Pull Request." >&2 @@ -43,6 +43,10 @@ while getopts ":pm:b:r:M:" opt; do echo "Base Branch: $OPTARG" >&2 BRANCH=$OPTARG ;; + B) + echo "bsim BT tests xml results file: $OPTARG" >&2 + BSIM_BT_TEST_RESULTS_FILE=$OPTARG + ;; r) echo "Remote: $OPTARG" >&2 REMOTE=$OPTARG