From 00def4f8e74c846f39fcc1412f0b6bc1fcf8ba70 Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Mon, 7 Dec 2015 10:28:34 +0100
Subject: [PATCH] CI: split up Cortex-M0 in two groups
---
.strider.yml | 3 ++-
.travis.yml | 3 ++-
boards/airfy-beacon/Makefile.features | 2 +-
boards/nrf51dongle/Makefile.features | 2 +-
boards/nrf6310/Makefile.features | 2 +-
boards/nucleo-f091/Makefile.features | 2 +-
boards/pca10000/Makefile.features | 2 +-
boards/pca10005/Makefile.features | 2 +-
boards/saml21-xpro/Makefile.features | 2 +-
boards/samr21-xpro/Makefile.features | 2 +-
boards/stm32f0discovery/Makefile.features | 2 +-
boards/weio/Makefile.features | 2 +-
boards/yunjia-nrf51822/Makefile.features | 2 +-
dist/tools/drone-scripts/build_and_test.sh | 3 ++-
dist/tools/travis-scripts/get-pkg-list.py | 4 ++--
15 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/.strider.yml b/.strider.yml
index 5b2cb5fb75..efee235ec0 100644
--- a/.strider.yml
+++ b/.strider.yml
@@ -9,7 +9,8 @@ env:
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=static-tests
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_2
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_1
- - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0
+ - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0_2
+ - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0_1
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=x86
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_2
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_1
diff --git a/.travis.yml b/.travis.yml
index fc7c92b2ed..6f6c8e290d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,8 @@ env:
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=static-tests
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_2
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_1
- - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0
+ - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0_2
+ - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0_1
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=x86
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_2
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_1
diff --git a/boards/airfy-beacon/Makefile.features b/boards/airfy-beacon/Makefile.features
index 89a8a9bf13..badcfdd52d 100644
--- a/boards/airfy-beacon/Makefile.features
+++ b/boards/airfy-beacon/Makefile.features
@@ -13,4 +13,4 @@ FEATURES_PROVIDED += cpp
FEATURES_PROVIDED += radio_nrfmin
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_2
diff --git a/boards/nrf51dongle/Makefile.features b/boards/nrf51dongle/Makefile.features
index 65262bfc08..7a11395375 100644
--- a/boards/nrf51dongle/Makefile.features
+++ b/boards/nrf51dongle/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += cpp
FEATURES_PROVIDED += radio_nrfmin
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/nrf6310/Makefile.features b/boards/nrf6310/Makefile.features
index 5e5c632d7e..654dd547c2 100644
--- a/boards/nrf6310/Makefile.features
+++ b/boards/nrf6310/Makefile.features
@@ -12,4 +12,4 @@ FEATURES_PROVIDED += cpp
FEATURES_PROVIDED += radio_nrfmin
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_2
diff --git a/boards/nucleo-f091/Makefile.features b/boards/nucleo-f091/Makefile.features
index c8bd5caade..c7f508057a 100644
--- a/boards/nucleo-f091/Makefile.features
+++ b/boards/nucleo-f091/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/pca10000/Makefile.features b/boards/pca10000/Makefile.features
index 65262bfc08..679b12a7c9 100644
--- a/boards/pca10000/Makefile.features
+++ b/boards/pca10000/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += cpp
FEATURES_PROVIDED += radio_nrfmin
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_2
diff --git a/boards/pca10005/Makefile.features b/boards/pca10005/Makefile.features
index 89a8a9bf13..15d011d617 100644
--- a/boards/pca10005/Makefile.features
+++ b/boards/pca10005/Makefile.features
@@ -13,4 +13,4 @@ FEATURES_PROVIDED += cpp
FEATURES_PROVIDED += radio_nrfmin
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/saml21-xpro/Makefile.features b/boards/saml21-xpro/Makefile.features
index 013e25cb9d..3592748fac 100644
--- a/boards/saml21-xpro/Makefile.features
+++ b/boards/saml21-xpro/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_2
diff --git a/boards/samr21-xpro/Makefile.features b/boards/samr21-xpro/Makefile.features
index 6c981cf570..3b09ac148d 100644
--- a/boards/samr21-xpro/Makefile.features
+++ b/boards/samr21-xpro/Makefile.features
@@ -13,4 +13,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_2
diff --git a/boards/stm32f0discovery/Makefile.features b/boards/stm32f0discovery/Makefile.features
index 24bf3142e1..c5fce98a77 100644
--- a/boards/stm32f0discovery/Makefile.features
+++ b/boards/stm32f0discovery/Makefile.features
@@ -10,4 +10,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/weio/Makefile.features b/boards/weio/Makefile.features
index 469294c05b..30c35d42e8 100644
--- a/boards/weio/Makefile.features
+++ b/boards/weio/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/yunjia-nrf51822/Makefile.features b/boards/yunjia-nrf51822/Makefile.features
index efb3091a43..558d62e846 100644
--- a/boards/yunjia-nrf51822/Makefile.features
+++ b/boards/yunjia-nrf51822/Makefile.features
@@ -13,4 +13,4 @@ FEATURES_PROVIDED += radio_nrfmin
FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_2
diff --git a/dist/tools/drone-scripts/build_and_test.sh b/dist/tools/drone-scripts/build_and_test.sh
index 99e455a95a..7086a025e1 100755
--- a/dist/tools/drone-scripts/build_and_test.sh
+++ b/dist/tools/drone-scripts/build_and_test.sh
@@ -65,7 +65,8 @@ if $FULL_CHECK; then
# Execute all groups in parallel (-k ensures correct ordering of the
# output)
parallel -k exec_build_func {} "$@" ::: static-tests avr8 msp430 x86 arm7 \
- cortex_m0 cortex_m3_1 cortex_m3_2 \
+ cortex_m0_2 cortex_m0_1 \
+ cortex_m3_1 cortex_m3_2 \
cortex_m4_1 cortex_m4_2 \
|& tee -a "$MYTMPDIR/output.log"
else
diff --git a/dist/tools/travis-scripts/get-pkg-list.py b/dist/tools/travis-scripts/get-pkg-list.py
index 777af8de88..ecae99d44d 100755
--- a/dist/tools/travis-scripts/get-pkg-list.py
+++ b/dist/tools/travis-scripts/get-pkg-list.py
@@ -20,8 +20,8 @@
import os
-arm_mcu_groups = ["arm7", "cortex_m0", "cortex_m3_1", "cortex_m3_2",
- "cortex_m4_1", "cortex_m4_2"]
+arm_mcu_groups = ["arm7", "cortex_m0_2", "cortex_m0_1", "cortex_m3_1",
+ "cortex_m3_2", "cortex_m4_1", "cortex_m4_2"]
msp_mcu_groups = ["msp430"]
x86_mcu_groups = ["x86"]
avr8_mcu_groups = ["avr8"]
--
GitLab