espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci/fix-custom-oocd-setting_v5.3' into 'release/v5.3'

Browse Source 
ci: select OpenOCD binary based on runner (v5.3)

See merge request espressif/esp-idf!39378
This commit is contained in:
Alexey Gerenkov
2025-06-09 23:17:49 +08:00
parent d1159f634d e75d5b9c46
commit e64f3d7559
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.gitlab/ci/common.yml
View File

@ -177,13 +177,21 @@ variables:
fi fi
# Custom OpenOCD # Custom OpenOCD
if [[ ! -z "$OOCD_DISTRO_URL" && "$CI_JOB_STAGE" == "target_test" ]]; then if [[ "$CI_JOB_STAGE" == "target_test" ]]; then
echo "Using custom OpenOCD from ${OOCD_DISTRO_URL}" machine="$(uname -m)"
wget $OOCD_DISTRO_URL if [[ "$machine" == "armv7l" ]] ; then
ARCH_NAME=$(basename $OOCD_DISTRO_URL) OOCD_DISTRO_URL="$OOCD_DISTRO_URL_ARMHF"
tar -x -f $ARCH_NAME elif [[ "$machine" == "aarch64" ]] ; then
export OPENOCD_SCRIPTS=$PWD/openocd-esp32/share/openocd/scripts OOCD_DISTRO_URL="$OOCD_DISTRO_URL_ARM64"
export PATH=$PWD/openocd-esp32/bin:$PATH fi
if [[ ! -z "$OOCD_DISTRO_URL" ]]; then
echo "Using custom OpenOCD from ${OOCD_DISTRO_URL}"
wget $OOCD_DISTRO_URL
ARCH_NAME=$(basename $OOCD_DISTRO_URL)
tar -x -f $ARCH_NAME
export OPENOCD_SCRIPTS=$PWD/openocd-esp32/share/openocd/scripts
export PATH=$PWD/openocd-esp32/bin:$PATH
fi
fi fi
if [[ -n "$CI_PYTHON_TOOL_REPO" ]]; then if [[ -n "$CI_PYTHON_TOOL_REPO" ]]; then

2
.gitlab/ci/pre_check.yml
View File

@ -160,6 +160,8 @@ pipeline_variables:
if [ -n "$CI_PYTHON_CONSTRAINT_BRANCH" ]; then if [ -n "$CI_PYTHON_CONSTRAINT_BRANCH" ]; then
echo "BUILD_AND_TEST_ALL_APPS=1" >> pipeline.env echo "BUILD_AND_TEST_ALL_APPS=1" >> pipeline.env
fi fi
- echo "OOCD_DISTRO_URL_ARMHF=$OOCD_DISTRO_URL_ARMHF" >> pipeline.env
- echo "OOCD_DISTRO_URL_ARM64=$OOCD_DISTRO_URL_ARM64" >> pipeline.env
- cat pipeline.env - cat pipeline.env
- python tools/ci/artifacts_handler.py upload --type modified_files_and_components_report - python tools/ci/artifacts_handler.py upload --type modified_files_and_components_report
artifacts: artifacts:

3
tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
View File

@ -51,6 +51,9 @@
TARGET_SELECTOR: "" TARGET_SELECTOR: ""
ENV_MARKERS: "" ENV_MARKERS: ""
PYTEST_EXTRA_FLAGS: "--dev-passwd ${ETHERNET_TEST_PASSWORD} --dev-user ${ETHERNET_TEST_USER} --capture=fd --verbosity=0" PYTEST_EXTRA_FLAGS: "--dev-passwd ${ETHERNET_TEST_PASSWORD} --dev-user ${ETHERNET_TEST_USER} --capture=fd --verbosity=0"
needs:
- pipeline: $PARENT_PIPELINE_ID
job: pipeline_variables
cache: cache:
# Usually do not need submodule-cache in target_test # Usually do not need submodule-cache in target_test
- key: pip-cache-${LATEST_GIT_TAG} - key: pip-cache-${LATEST_GIT_TAG}