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 <alpi@oticon.com>
This commit is contained in:
Alberto Escolar Piedras 2018-11-15 11:41:58 +01:00 committed by Anas Nashif
parent d92fd5a5b8
commit 2d580a8339
2 changed files with 7 additions and 3 deletions

View File

@ -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:

View File

@ -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