Allowing examples to specify which repo source to use for testing.

They can pick from either the mbed developer site or the GitHub
repository.
pull/4385/head
Brian Daniels 2017-05-24 11:10:49 -05:00
parent 186f406c24
commit 3966139cd7
2 changed files with 36 additions and 25 deletions

View File

@ -6,6 +6,7 @@
"mbed": [ "mbed": [
"https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-blinky" "https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-blinky"
], ],
"test-repo-source": "github",
"features" : [], "features" : [],
"targets" : [], "targets" : [],
"toolchains" : [], "toolchains" : [],
@ -23,6 +24,7 @@
"https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-tls-hashing", "https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-tls-hashing",
"https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-tls-authcrypt" "https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-tls-authcrypt"
], ],
"test-repo-source": "mbed",
"features" : [], "features" : [],
"targets" : ["K64F", "NUCLEO_F429ZI"], "targets" : ["K64F", "NUCLEO_F429ZI"],
"toolchains" : ["GCC_ARM", "ARM"], "toolchains" : ["GCC_ARM", "ARM"],
@ -37,6 +39,7 @@
"mbed": [ "mbed": [
"https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-mesh-minimal" "https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-mesh-minimal"
], ],
"test-repo-source": "github",
"features" : [], "features" : [],
"targets" : ["DISCO_F469NI", "DISCO_F746NG", "K64F", "K66F", "targets" : ["DISCO_F469NI", "DISCO_F746NG", "K64F", "K66F",
"NUCLEO_F429ZI", "NUCLEO_F439ZI", "NUCLEO_F746ZG", "NUCLEO_F429ZI", "NUCLEO_F439ZI", "NUCLEO_F746ZG",
@ -63,6 +66,7 @@
"https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-ble-Button", "https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-ble-Button",
"https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-ble-BatteryLevel" "https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-ble-BatteryLevel"
], ],
"test-repo-source": "mbed",
"features" : ["BLE"], "features" : ["BLE"],
"targets" : ["NRF51_DK", "NRF52_DK", "K64F", "NUCLEO_F401RE"], "targets" : ["NRF51_DK", "NRF52_DK", "K64F", "NUCLEO_F401RE"],
"toolchains" : [], "toolchains" : [],
@ -77,6 +81,7 @@
"mbed": [ "mbed": [
"https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-client" "https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-client"
], ],
"test-repo-source": "github",
"features" : ["LWIP"], "features" : ["LWIP"],
"targets" : [], "targets" : [],
"toolchains" : [], "toolchains" : [],
@ -90,6 +95,7 @@
"github":"https://github.com/ARMmbed/mbed-os-example-sockets", "github":"https://github.com/ARMmbed/mbed-os-example-sockets",
"mbed": [ "mbed": [
], ],
"test-repo-source": "github",
"features" : ["LWIP"], "features" : ["LWIP"],
"targets" : [], "targets" : [],
"toolchains" : [], "toolchains" : [],
@ -103,6 +109,7 @@
"github":"https://github.com/ARMmbed/mbed-os-example-wifi", "github":"https://github.com/ARMmbed/mbed-os-example-wifi",
"mbed": [ "mbed": [
], ],
"test-repo-source": "github",
"features" : [], "features" : [],
"targets" : [], "targets" : [],
"toolchains" : [], "toolchains" : [],
@ -115,6 +122,7 @@
"name": "mbed-os-example-uvisor", "name": "mbed-os-example-uvisor",
"github":"https://github.com/ARMmbed/mbed-os-example-uvisor", "github":"https://github.com/ARMmbed/mbed-os-example-uvisor",
"mbed": [], "mbed": [],
"test-repo-source": "github",
"features" : [], "features" : [],
"targets" : ["K64F"], "targets" : ["K64F"],
"toolchains" : ["GCC_ARM"], "toolchains" : ["GCC_ARM"],
@ -127,6 +135,7 @@
"name": "mbed-os-example-uvisor-thread", "name": "mbed-os-example-uvisor-thread",
"github":"https://github.com/ARMmbed/mbed-os-example-uvisor-thread", "github":"https://github.com/ARMmbed/mbed-os-example-uvisor-thread",
"mbed": [], "mbed": [],
"test-repo-source": "github",
"features" : [], "features" : [],
"targets" : ["K64F"], "targets" : ["K64F"],
"toolchains" : ["GCC_ARM"], "toolchains" : ["GCC_ARM"],
@ -139,6 +148,7 @@
"name": "mbed-os-example-uvisor-number-store", "name": "mbed-os-example-uvisor-number-store",
"github":"https://github.com/ARMmbed/mbed-os-example-uvisor-number-store", "github":"https://github.com/ARMmbed/mbed-os-example-uvisor-number-store",
"mbed": [], "mbed": [],
"test-repo-source": "github",
"features" : [], "features" : [],
"targets" : ["K64F"], "targets" : ["K64F"],
"toolchains" : ["GCC_ARM"], "toolchains" : ["GCC_ARM"],
@ -153,6 +163,7 @@
"mbed": [ "mbed": [
"https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-bootloader" "https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-bootloader"
], ],
"test-repo-source": "github",
"features" : [], "features" : [],
"targets" : ["K64F", "NUCLEO_F429ZI", "UBLOX_EVK_ODIN_W2"], "targets" : ["K64F", "NUCLEO_F429ZI", "UBLOX_EVK_ODIN_W2"],
"toolchains" : [], "toolchains" : [],
@ -167,6 +178,7 @@
"mbed": [ "mbed": [
"https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-fat-filesystem" "https://developer.mbed.org/teams/mbed-os-examples/code/mbed-os-example-fat-filesystem"
], ],
"test-repo-source": "github",
"features" : [], "features" : [],
"targets" : ["K64F"], "targets" : ["K64F"],
"toolchains" : [], "toolchains" : [],
@ -179,6 +191,7 @@
"name": "nanostack-border-router", "name": "nanostack-border-router",
"github":"https://github.com/ARMmbed/nanostack-border-router", "github":"https://github.com/ARMmbed/nanostack-border-router",
"mbed": [], "mbed": [],
"test-repo-source": "github",
"features" : [], "features" : [],
"targets" : ["K64F", "K66F", "NUCLEO_F429ZI"], "targets" : ["K64F", "K66F", "NUCLEO_F429ZI"],
"toolchains" : [], "toolchains" : [],

View File

@ -123,20 +123,19 @@ def target_cross_ide(allowed_targets, allowed_ides, features=[], toolchains=[]):
def get_repo_list(example): def get_repo_list(example):
""" Returns a list of all the repos associated with the specific example in the json """ Returns a list of all the repos and their types associated with the
config file. specific example in the json config file.
If there are repos listed under the mbed section then these will be returned as a If the key 'test-repo-source' is set to 'mbed', then it will return the
list. If not then the github single repo with be returned. mbed section as a list. Otherwise, it will return the single github repo.
NOTE: This does not currently deal with multiple examples underneath a github NOTE: This does not currently deal with multiple examples underneath a github
sourced exampe repo. sourced exampe repo.
Args: Args:
example - Example for which the repo list is requested example - Example for which the repo list is requested
repos - The list of repos and types contained within that example in the json file
""" """
repos = [] repos = []
if len(example['mbed']) > 0: if example['test-repo-source'] == 'mbed':
for repo in example['mbed']: for repo in example['mbed']:
repos.append({ repos.append({
'repo': repo, 'repo': repo,
@ -397,4 +396,3 @@ def update_mbedos_version(config, tag, examples):
os.chdir(update_dir) os.chdir(update_dir)
subprocess.call(["mbed-cli", "update", tag, "--clean"]) subprocess.call(["mbed-cli", "update", tag, "--clean"])
os.chdir("../..") os.chdir("../..")