Merge branch 'bugfix/custom_oocd_for_target_tests_only' into 'master'

ci: Install custom OpenOCD for target tests only

See merge request espressif/esp-idf!12674
This commit is contained in:
Ivan Grokhotkov 2021-03-11 08:20:20 +00:00
commit 835493d8da

View File

@ -66,7 +66,7 @@ variables:
fi fi
if [[ "$SETUP_TOOLS" == "1" || "$CI_JOB_STAGE" != "target_test" ]]; then if [[ "$SETUP_TOOLS" == "1" || "$CI_JOB_STAGE" != "target_test" ]]; then
tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)" || exit 1 tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)" || exit 1
if [[ ! -z "$OOCD_DISTRO_URL" ]]; then if [[ ! -z "$OOCD_DISTRO_URL" && "$CI_JOB_STAGE" == "target_test" ]]; then
echo "Using custom OpenOCD from ${OOCD_DISTRO_URL}" echo "Using custom OpenOCD from ${OOCD_DISTRO_URL}"
wget $OOCD_DISTRO_URL wget $OOCD_DISTRO_URL
ARCH_NAME=$(basename $OOCD_DISTRO_URL) ARCH_NAME=$(basename $OOCD_DISTRO_URL)