riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17545 from fjmolinas/pr_iotlab_node_docker_riotci_build

Browse Source 
Makefile.include: pass IOTLAB_NODE to docker
This commit is contained in:
Alexandre Abadie 2022-01-27 20:20:03 +01:00 committed by GitHub
commit 6371051bc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/test-on-iotlab.yml vendored
View File

@ -82,10 +82,6 @@ jobs:
env: env:
IOTLAB_NODE: auto IOTLAB_NODE: auto
BUILD_IN_DOCKER: 1 BUILD_IN_DOCKER: 1
# Force .bin files generation because these files are used to flash on IoT-LAB and
# because compile_and_test_for_board forces RIOT_CI_BUILD which skip .bin
# files generation
DOCKER_ENVIRONMENT_CMDLINE: -e BUILD_FILES=\$$\(BINFILE\)
COMPILE_AND_TEST_FOR_BOARD: ./dist/tools/compile_and_test_for_board/compile_and_test_for_board.py COMPILE_AND_TEST_FOR_BOARD: ./dist/tools/compile_and_test_for_board/compile_and_test_for_board.py
COMPILE_AND_TEST_ARGS: --with-test-only --jobs=2 --report-xml COMPILE_AND_TEST_ARGS: --with-test-only --jobs=2 --report-xml
# Exclude applications that are expected to fail or cannot run on iotlab # Exclude applications that are expected to fail or cannot run on iotlab

11
Makefile.include
View File

@ -386,6 +386,17 @@ ifneq (,$(IOTLAB_NODE))
PROGRAMMER ?= iotlab PROGRAMMER ?= iotlab
# iotlab uses ELFFILE by default for flashing boards. # iotlab uses ELFFILE by default for flashing boards.
FLASHFILE ?= $(ELFFILE) FLASHFILE ?= $(ELFFILE)
# RIOT_CI_BUILD disables the build of BINFILE which is required for flashing
# on IoT-LAB
ifeq (1,$(RIOT_CI_BUILD))
BUILD_FILES += $(BINFILE)
endif
# Disable IOTLAB_NODE if inside Docker to avoid including the
# iotlab.single.inc.mk file which is useless there: it's only useful for
# flashing and this is done outside of Docker.
ifeq (1,$(INSIDE_DOCKER))
IOTLAB_NODE :=
endif
endif endif
# Add standard include directories # Add standard include directories

1
makefiles/docker.inc.mk
View File

@ -47,6 +47,7 @@ export DOCKER_ENV_VARS += \
ELFFILE \ ELFFILE \
HEXFILE \ HEXFILE \
FLASHFILE \ FLASHFILE \
IOTLAB_NODE \
LINK \ LINK \
LINKFLAGPREFIX \ LINKFLAGPREFIX \
LINKFLAGS \ LINKFLAGS \