Skip to content

Commit 51f9740

Browse files
P403n1x87brettlangdon
authored andcommitted
chore: separate run-tests prefix (#19374)
## Description We use a separate riot prefix for tests that are run via the run-tests scripts to avoid conflicts with local test runs on bare metal. Co-authored-by: gabriele.tornetta <gabriele.tornetta@datadoghq.com>
1 parent 5897126 commit 51f9740

2 files changed

Lines changed: 11 additions & 0 deletions

File tree

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,11 @@ CLAUDE.local.md
171171
.riot/.build.lock
172172
.riot/requirements/*.in
173173

174+
# Riot venvs built inside the testrunner container (see docker-compose.yml
175+
# RIOT_ENV_BASE_PATH) — kept separate from .riot/venv* to avoid mixing Linux
176+
# container binaries with host-native (e.g. macOS) venvs on the shared mount.
177+
.riot/docker/
178+
174179
# Benchmarks
175180
artifacts/
176181

docker-compose.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,12 @@ services:
221221
DD_USE_SCCACHE: "1"
222222
SCCACHE_DIR: "/home/bits/.cache/sccache"
223223
DD_PROFILING_MEMALLOC_ASSERT_ON_REENTRY: "1"
224+
# Store riot venvs in a subdir separate from the host's .riot/venv* dirs
225+
# (shared via the project bind mount below). Without this, venvs built
226+
# inside the Linux container and venvs built natively on the host (e.g.
227+
# macOS) collide in the same path, and riot picks up incompatible
228+
# prebuilt binaries.
229+
RIOT_ENV_BASE_PATH: ".riot/docker"
224230
network_mode: host
225231
userns_mode: host
226232
working_dir: /home/bits/project/

0 commit comments

Comments
 (0)