michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ci: define BSIM_* variables in ci script directly

Browse source 
Rather than pass them as options, just set it directly in the CI script.

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

7
.shippable.yml
View file

@ -11,9 +11,6 @@ env:
- ZEPHYR_TOOLCHAIN_VARIANT=zephyr - ZEPHYR_TOOLCHAIN_VARIANT=zephyr
- MATRIX_BUILDS="5" - MATRIX_BUILDS="5"
- MATRIX_BUILDS_EXTRA="5" - MATRIX_BUILDS_EXTRA="5"
- BSIM_OUT_PATH=/opt/bsim/
- BSIM_COMPONENTS_PATH=${BSIM_OUT_PATH}/components/
- BSIM_BT_TEST_RESULTS_FILE="./bsim_bt_out/bsim_results.xml"
matrix: matrix:
- MATRIX_BUILD="1" - MATRIX_BUILD="1"
- MATRIX_BUILD="2" - MATRIX_BUILD="2"
@ -35,9 +32,9 @@ build:
- export CCACHE_DIR=${SHIPPABLE_BUILD_DIR}/ccache/.ccache - export CCACHE_DIR=${SHIPPABLE_BUILD_DIR}/ccache/.ccache
- > - >
if [ "$IS_PULL_REQUEST" = "true" ]; then if [ "$IS_PULL_REQUEST" = "true" ]; then
./scripts/ci/run_ci.sh -c -b ${PULL_REQUEST_BASE_BRANCH} -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS} -B ${BSIM_BT_TEST_RESULTS_FILE} -p; ./scripts/ci/run_ci.sh -c -b ${PULL_REQUEST_BASE_BRANCH} -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS} -p;
else else
./scripts/ci/run_ci.sh -c -b ${PULL_REQUEST_BASE_BRANCH} -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS} -B ${BSIM_BT_TEST_RESULTS_FILE}; ./scripts/ci/run_ci.sh -c -b ${PULL_REQUEST_BASE_BRANCH} -r origin -m ${MATRIX_BUILD} -M ${MATRIX_BUILDS};
fi; fi;
- ccache -s - ccache -s
on_failure: on_failure:

4
scripts/ci/run_ci.sh
View file

@ -25,6 +25,10 @@ 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" SANITYCHECK="${ZEPHYR_BASE}/scripts/sanitycheck"
BSIM_OUT_PATH="/opt/bsim/"
BSIM_COMPONENTS_PATH="${BSIM_OUT_PATH}/components/"
BSIM_BT_TEST_RESULTS_FILE="./bsim_bt_out/bsim_results.xml"
MATRIX_BUILDS=1 MATRIX_BUILDS=1
MATRIX=1 MATRIX=1