Makefile.include: pass IOTLAB_NODE to docker

[fjmolinas]

Contribution description

Release testing I cam upon this corner case, not sure this is the best fix, open to ideas.

By default if IoT-LAB Cli Tools V3 is used then BINFILE is used to
flash on IoT-LAB. But BINFILE is not built by default when RIOT_CI_BUILD
is set as a ci optimization.

But since before IOTLAB_NODE was not passed to docker when building it
did not know that it should BUILD BINFILE as well, which led to failures
if doing:

$ IOTLAB_NODE=iotlab-m3.grenoble.iot-lab.info BOARD=iotlab-m3
RIOT_CI_BUILD=1 BUILD_IN_DOCKER=1 make -C examples/hello-world/ flash

But if IOTLAB_NODE is passed at is checks for IoT-LAB cli Tools also
happen in the docker container which leads to a make error since those
are not present in docker.

Therefore avoid including the IoT-LAB makefiles when in docker, but add
BINFILE to BUILD_FILES if IOTLAB_NODE is set

Testing procedure

$ IOTLAB_NODE=iotlab-m3.103.grenoble.iot-lab.info BOARD=iotlab-m3
RIOT_CI_BUILD=1 BUILD_IN_DOCKER=1 make -C examples/hello-world/ flash

Fails in master succeeds with this PR

[fjmolinas]

@aabadie

[aabadie]

In the test-on-iotlab GH action, only adapting BUILD_FILES is needed:

RIOT/.github/workflows/test-on-iotlab.yml

Lines 73 to 76 in b985a74

	# 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\)

I don't know how but IOTLAB_NODE is set correctly even when using BUILD_IN_DOCKER (or this action is also broken).

[aabadie]

I don't know how but IOTLAB_NODE is set correctly even when using BUILD_IN_DOCKER

I know: IOTLAB_NODE doesn't need to be known from Docker, since it's only used by the flasher.

[aabadie]

I would only do this is RIOT_CI_BUILD is set:

Suggested change

	BUILD_FILES += $(BINFILE)
	ifeq (1,$(RIOT_CI_BUILD))
	BUILD_FILES += $(BINFILE)
	endif

[aabadie]

Can we keep the alphabetical order (which as I saw it is already a bit broken...) ?

[aabadie]

I came up with a similar approach (not sure it's better):

diff --git a/Makefile.include b/Makefile.include
index a91c125ecc..97810cece7 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -386,6 +386,17 @@ ifneq (,$(IOTLAB_NODE))
   PROGRAMMER ?= iotlab
   # iotlab uses ELFFILE by default for flashing boards.
   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
 
 # Add standard include directories
diff --git a/makefiles/docker.inc.mk b/makefiles/docker.inc.mk
index cfa6cc7c4e..c32a244993 100644
--- a/makefiles/docker.inc.mk
+++ b/makefiles/docker.inc.mk
@@ -47,6 +47,7 @@ export DOCKER_ENV_VARS += \
   ELFFILE \
   HEXFILE \
   FLASHFILE \
+  IOTLAB_NODE \
   LINK \
   LINKFLAGPREFIX \
   LINKFLAGS \

The test-on-iotlab GH action has also to be updated.

[fjmolinas]

Applied suggested changes

[aabadie]

Running the test-on-iotlab action on my fork and it works ok.

Code changes are good.

ACK