Skip to content

Add Wi-SUN configurations for CI #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2019
Merged

Add Wi-SUN configurations for CI #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ def raas = [

// List of targets with supported RF shields to compile
def targets = [
"K64F": ["ATMEL", "MCR20A"],
"K64F": ["ATMEL", "MCR20A", "S2LP"],
"NUCLEO_F401RE": ["ATMEL", "MCR20A"],
"NUCLEO_F429ZI": ["ATMEL", "MCR20A"],
"NUCLEO_F429ZI": ["ATMEL", "MCR20A", "S2LP"],
//"NCS36510": ["internal"],
"UBLOX_EVK_ODIN_W2": ["ATMEL"],
"KW24D": ["internal"],
Expand All @@ -54,13 +54,15 @@ def toolchains = [
def radioshields = [
"ATMEL",
"MCR20A",
"internal"
"internal",
"S2LP"
]

// Mesh interfaces: 6LoWPAN and Thread
def meshinterfaces = [
"6lp",
"thd"
"thd",
"ws"
]

def stepsForParallel = [:]
Expand All @@ -77,9 +79,12 @@ for (int i = 0; i < targets.size(); i++) {
def radioshield = radioshields.get(k)
def meshInterface = meshinterfaces.get(l)

def stepName = "${target} ${toolchain} ${radioshield} ${meshInterface}"
if(allowed_shields.contains(radioshield)) {
stepsForParallel[stepName] = buildStep(target, compilerLabel, toolchain, radioshield, meshInterface)
// Build Wi-SUN only with S2LP and use S2LP only with Wi-SUN
if (("${meshInterface}" == "ws" && "${radioshield}" == "S2LP") || ("${meshInterface}" != "ws" && "${radioshield}" != "S2LP")) {
def stepName = "${target} ${toolchain} ${radioshield} ${meshInterface}"
if(allowed_shields.contains(radioshield)) {
stepsForParallel[stepName] = buildStep(target, compilerLabel, toolchain, radioshield, meshInterface)
}
}
}
}
Expand Down Expand Up @@ -135,6 +140,12 @@ def buildStep(target, compilerLabel, toolchain, radioShield, meshInterface) {
execute("sed -i 's/\"mbed-mesh-api.6lowpan-nd-panid-filter\": \"0xffff\"/\"mbed-mesh-api.6lowpan-nd-panid-filter\": \"0xABBA\"/' ${config_file}")
}

if ("${meshInterface}" == "ws") {
config_file = "./configs/mesh_wisun${config_suffix}.json"
// Possibly in future use systest Wi-SUN Border Router for testing (Network name = "ARM-WS-TESTING")
execute("sed -i 's/\"mbed-mesh-api.wisun-network-name\": \"\\\"Wi-SUN Network\\\"\"/\"mbed-mesh-api.wisun-network-name\": \"\\\"ARM-WS-LAB-NWK\\\"\"/' ${config_file}")
}

// For KW24D, we need to optimize for low memory
if ("${target}" == "KW24D") {
// Use optimal mbed TLS config file, need double escaping of '\' characters, first ones to escape Grooy, second ones to escape shell
Expand Down
4 changes: 3 additions & 1 deletion configs/mesh_wisun_S2LP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
"target_overrides": {
"*": {
"nsapi.default-mesh-type": "WISUN",
"mbed-mesh-api.wisun-network-name": "\"WS-TEST\"",
"mbed-mesh-api.wisun-network-name": "\"Wi-SUN Network\"",
"nanostack.configuration": "ws_router",
"mbed-trace.enable": false,
"platform.stdio-convert-newlines": true,
"platform.stdio-baud-rate": 115200,
"platform.stdio-buffered-serial": true,
"s2lp.provide-default": true,
"target.device_has_add": ["802_15_4_PHY"]
},
Expand Down