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

Merge pull request #16491 from aabadie/pr/tools/iotlab_deprecate_auto_ssh

Browse Source 
tools/testbed: use IOTLAB_NODE=auto instead of auto-ssh
This commit is contained in:
Alexandre Abadie 2021-05-28 19:23:54 +02:00 committed by GitHub
commit 64c7332874
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: ${{ matrix.boards.riot }} name: ${{ matrix.boards.riot }}
env: env:
IOTLAB_NODE: auto-ssh 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 # 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 # because compile_and_test_for_board forces RIOT_CI_BUILD which skip .bin

39
dist/testbed-support/makefile.iotlab.single.inc.mk vendored
View File

@ -44,10 +44,16 @@ ifeq (,$(IOTLAB_NODE))
$(warning Example: m3-380.grenoble.iot-lab.info or a8-1.grenoble.iot-lab.info) $(warning Example: m3-380.grenoble.iot-lab.info or a8-1.grenoble.iot-lab.info)
$(warning * <type>-<number> when run from iot-lab frontend) $(warning * <type>-<number> when run from iot-lab frontend)
$(warning Example: m3-380 or a8-1) $(warning Example: m3-380 or a8-1)
$(warning * 'auto' or 'auto-ssh' to try auto-detecting the node from your experiment $(warning * 'auto' to try auto-detecting the node from your experiment
$(error) $(error)
endif endif
ifeq (auto-ssh,$(IOTLAB_NODE))
$(info $(COLOR_YELLOW)IOTLAB_NODE=auto-ssh is deprecated and will be removed after \
2010.07 is released, use IOTLAB_NODE=auto instead$(COLOR_RESET))
override IOTLAB_NODE := auto
endif
IOTLAB_AUTH ?= $(HOME)/.iotlabrc IOTLAB_AUTH ?= $(HOME)/.iotlabrc
IOTLAB_USER ?= $(shell cut -f1 -d: $(IOTLAB_AUTH)) IOTLAB_USER ?= $(shell cut -f1 -d: $(IOTLAB_AUTH))
@ -57,7 +63,7 @@ IOTLAB_EXP_ID ?=
# Specify experiment-id option if provided # Specify experiment-id option if provided
_IOTLAB_EXP_ID := $(if $(IOTLAB_EXP_ID),--id $(IOTLAB_EXP_ID)) _IOTLAB_EXP_ID := $(if $(IOTLAB_EXP_ID),--id $(IOTLAB_EXP_ID))
# Number of the node to take from the list in 'auto' and 'auto-ssh' mode # Number of the node to take from the list in 'auto' mode
# Default to 1 so the first one # Default to 1 so the first one
IOTLAB_NODE_AUTO_NUM ?= 1 IOTLAB_NODE_AUTO_NUM ?= 1
@ -109,18 +115,18 @@ endif
# * Check correctly deployed nodes with 'deploymentresults == "0"' # * Check correctly deployed nodes with 'deploymentresults == "0"'
# * Select nodes by architucture using the board-archi mapping # * Select nodes by architucture using the board-archi mapping
# * Nodes for current server in 'auto' # * Nodes for current server in 'auto'
ifneq (,$(filter auto auto-ssh,$(IOTLAB_NODE))) ifeq (auto,$(IOTLAB_NODE))
ifeq (,$(IOTLAB_ARCHI)) ifeq (,$(IOTLAB_ARCHI))
$(error Could not find 'archi' for $(BOARD), update mapping in $(lastword $(MAKEFILE_LIST))) $(error Could not find 'archi' for $(BOARD), update mapping in $(lastword $(MAKEFILE_LIST)))
endif endif
ifeq (auto,$(IOTLAB_NODE)) ifneq (,$(IOT_LAB_FRONTEND_FQDN))
_NODES_DEPLOYED := $(filter %.$(shell hostname).iot-lab.info, $(_NODES_DEPLOYED)) _NODES_DEPLOYED := $(filter %.$(IOT_LAB_FRONTEND_FQDN), $(_NODES_DEPLOYED))
endif endif
_NODES_FOR_BOARD = $(shell iotlab-experiment --jmespath="items[?archi=='$(IOTLAB_ARCHI)'].network_address" --format='" ".join' get $(_IOTLAB_EXP_ID) $(_NODES_LIST_OPTION)) _NODES_FOR_BOARD = $(shell iotlab-experiment --jmespath="items[?archi=='$(IOTLAB_ARCHI)'].network_address" --format='" ".join' get $(_IOTLAB_EXP_ID) $(_NODES_LIST_OPTION))
_IOTLAB_NODE := $(word $(IOTLAB_NODE_AUTO_NUM),$(filter $(_NODES_DEPLOYED),$(_NODES_FOR_BOARD))) _IOTLAB_NODE := $(word $(IOTLAB_NODE_AUTO_NUM),$(filter $(_NODES_DEPLOYED),$(_NODES_FOR_BOARD)))
ifeq (auto,$(IOTLAB_NODE)) ifneq (,$(IOT_LAB_FRONTEND_FQDN))
override IOTLAB_NODE := $(firstword $(subst ., ,$(_IOTLAB_NODE))) override IOTLAB_NODE := $(firstword $(subst ., ,$(_IOTLAB_NODE)))
else else
override IOTLAB_NODE := $(_IOTLAB_NODE) override IOTLAB_NODE := $(_IOTLAB_NODE)
@ -129,24 +135,14 @@ ifneq (,$(filter auto auto-ssh,$(IOTLAB_NODE)))
ifeq (,$(IOTLAB_NODE)) ifeq (,$(IOTLAB_NODE))
$(error Could not automatically find a node for BOARD=$(BOARD)) $(error Could not automatically find a node for BOARD=$(BOARD))
endif endif
override IOTLAB_NODE := $(patsubst node-%,%,$(IOTLAB_NODE))
endif endif
# If the IOTLAB_NODE format is:
# * 'type-num.iot.lab.info' assume it is run from your computer
# * 'type-num' assume it is run from iot-lab frontend
ifneq (,$(filter %.iot-lab.info, $(IOTLAB_NODE)))
_IOTLAB_ON_FRONTEND =
else
_IOTLAB_ON_FRONTEND = 1
endif
# Work with node url without 'node-' # Work with node url without 'node-'
override IOTLAB_NODE := $(patsubst node-%,%,$(IOTLAB_NODE)) override IOTLAB_NODE := $(patsubst node-%,%,$(IOTLAB_NODE))
# Create node list and optionally frontend url # Create node list and optionally frontend url
ifeq (,$(_IOTLAB_ON_FRONTEND)) ifeq (,$(IOT_LAB_FRONTEND_FQDN))
# Running from a local computer
# m3-380.grenoble.iot-lab.info -> grenoble,m3,380 # m3-380.grenoble.iot-lab.info -> grenoble,m3,380
# a8-1.grenoble.iot-lab.info -> grenoble,a8,1 # a8-1.grenoble.iot-lab.info -> grenoble,a8,1
_NODELIST_SED := 's/\([^.]*\)-\([^.]*\).\([^.]*\).*/\3,\1,\2/' _NODELIST_SED := 's/\([^.]*\)-\([^.]*\).\([^.]*\).*/\3,\1,\2/'
@ -156,6 +152,7 @@ ifeq (,$(_IOTLAB_ON_FRONTEND))
_IOTLAB_SERVER := $(shell echo '$(IOTLAB_NODE)' | sed 's/[^.]*.//') _IOTLAB_SERVER := $(shell echo '$(IOTLAB_NODE)' | sed 's/[^.]*.//')
_IOTLAB_AUTHORITY = $(IOTLAB_USER)@$(_IOTLAB_SERVER) _IOTLAB_AUTHORITY = $(IOTLAB_USER)@$(_IOTLAB_SERVER)
else else
# Running from an IoT-LAB frontend
# m3-380 -> $(hostname),m3,380 # m3-380 -> $(hostname),m3,380
# a8-1 -> $(hostname),a8,1 # a8-1 -> $(hostname),a8,1
_NODELIST_SED := 's/\([^.]*\)-\([^.]*\)/$(shell hostname),\1,\2/' _NODELIST_SED := 's/\([^.]*\)-\([^.]*\)/$(shell hostname),\1,\2/'
@ -164,7 +161,7 @@ endif
# Display value of IOTLAB_NODE, useful to get the value calculated when using # Display value of IOTLAB_NODE, useful to get the value calculated when using
# IOTLAB_NODE=auto or auto-ssh # IOTLAB_NODE=auto
.PHONY: info-iotlab-node .PHONY: info-iotlab-node
info-iotlab-node: info-iotlab-node:
@echo $(IOTLAB_NODE) @echo $(IOTLAB_NODE)
@ -181,7 +178,7 @@ ifneq (iotlab-a8-m3,$(BOARD))
FFLAGS = $(_NODE_FMT) $(_IOTLAB_EXP_ID) $(_IOTLAB_NODELIST) $(_NODES_FLASH_OPTION) $(FLASHFILE) FFLAGS = $(_NODE_FMT) $(_IOTLAB_EXP_ID) $(_IOTLAB_NODELIST) $(_NODES_FLASH_OPTION) $(FLASHFILE)
RESET_FLAGS = $(_NODE_FMT) $(_IOTLAB_EXP_ID) $(_IOTLAB_NODELIST) --reset RESET_FLAGS = $(_NODE_FMT) $(_IOTLAB_EXP_ID) $(_IOTLAB_NODELIST) --reset
ifeq (,$(_IOTLAB_ON_FRONTEND)) ifeq (,$(IOT_LAB_FRONTEND_FQDN))
TERMPROG = ssh TERMPROG = ssh
TERMFLAGS = -t $(_IOTLAB_AUTHORITY) 'socat - tcp:$(IOTLAB_NODE):20000' TERMFLAGS = -t $(_IOTLAB_AUTHORITY) 'socat - tcp:$(IOTLAB_NODE):20000'
else else
@ -199,7 +196,7 @@ else
RESET_FLAGS = $(_NODE_FMT) $(_IOTLAB_EXP_ID) reset-m3 $(_IOTLAB_NODELIST) RESET_FLAGS = $(_NODE_FMT) $(_IOTLAB_EXP_ID) reset-m3 $(_IOTLAB_NODELIST)
TERMPROG = ssh TERMPROG = ssh
ifeq (,$(_IOTLAB_ON_FRONTEND)) ifeq (,$(IOT_LAB_FRONTEND_FQDN))
# Proxy ssh through the iot-lab frontend # Proxy ssh through the iot-lab frontend
TERMFLAGS = -oProxyCommand='ssh $(_IOTLAB_AUTHORITY) -W %h:%p' TERMFLAGS = -oProxyCommand='ssh $(_IOTLAB_AUTHORITY) -W %h:%p'
else else

4
examples/lorawan/README.md
View File

@ -75,7 +75,7 @@ for that device.
2. flash device, set appropriate keys and test 2. flash device, set appropriate keys and test
$ DEVEUI=<device eui> APPEUI=<application eui> APPKEY=<application key> IOTLAB_NODE=auto-ssh make -C examples/lorawan/ flash test $ DEVEUI=<device eui> APPEUI=<application eui> APPKEY=<application key> IOTLAB_NODE=auto make -C examples/lorawan/ flash test
3. stop the iotlab experiment: 3. stop the iotlab experiment:
@ -84,4 +84,4 @@ for that device.
_note_: if you have multiple running experiments you will need to set `IOTLAB_EXP_ID` _note_: if you have multiple running experiments you will need to set `IOTLAB_EXP_ID`
to the appropriate experiment, when using the `iotlab-exp` you will see a: to the appropriate experiment, when using the `iotlab-exp` you will see a:
`Waiting that experiment 175694 gets in state Running`. That number matches `Waiting that experiment 175694 gets in state Running`. That number matches
the experiment id you started. the experiment id you started.

4
tests/pkg_semtech-loramac/README.md
View File

@ -256,7 +256,7 @@ for ABP. The test assumes that both devices have the same Application EUI.
2. flash device with the appropriate keys and test 2. flash device with the appropriate keys and test
$ DEVEUI=<...> APPEUI=<...> APPKEY=<...> DEVADDR=<...> NWKSKEY=<...> APPSKEY=<...> RX2_DR=<...> IOTLAB_NODE=auto-ssh make -C tests/pkg_semtech-loramac flash test $ DEVEUI=<...> APPEUI=<...> APPKEY=<...> DEVADDR=<...> NWKSKEY=<...> APPSKEY=<...> RX2_DR=<...> IOTLAB_NODE=auto make -C tests/pkg_semtech-loramac flash test
3. stop the iotlab experiment: 3. stop the iotlab experiment:
@ -265,4 +265,4 @@ for ABP. The test assumes that both devices have the same Application EUI.
_note_: if you have multiple running experiments you will need to set `IOTLAB_EXP_ID` _note_: if you have multiple running experiments you will need to set `IOTLAB_EXP_ID`
to the appropriate experiment, when using the `iotlab-exp` you will see a: to the appropriate experiment, when using the `iotlab-exp` you will see a:
`Waiting that experiment 175694 gets in state Running`. That number matches `Waiting that experiment 175694 gets in state Running`. That number matches
the experiment id you started. the experiment id you started.