Merge pull request #4399 from OlegHahm/travis_cm4_groups

CI: split up Cortex-M4 in two groups
7 years ago · 6c8d63bcac
16 changed files with 19 additions and 16 deletions
--- a/.strider.yml
+++ b/.strider.yml
@ -7,7 +7,8 @@ os:

 env:
    - NPROC_MAX=8 BUILDTEST_MCU_GROUP=static-tests
-    - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4
+    - 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=x86
    - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_2
--- a/.travis.yml
+++ b/.travis.yml
@ -4,7 +4,8 @@ cache: apt

 env:
    - NPROC_MAX=8 BUILDTEST_MCU_GROUP=static-tests
-    - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4
+    - 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=x86
    - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_2
--- a/boards/ek-lm4f120xl/Makefile.features
+++ b/boards/ek-lm4f120xl/Makefile.features
@ -7,4 +7,4 @@ FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += cpp

 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_1
--- a/boards/f4vi1/Makefile.features
+++ b/boards/f4vi1/Makefile.features
@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += cpp

 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_1
--- a/boards/frdm-k64f/Makefile.features
+++ b/boards/frdm-k64f/Makefile.features
@ -15,4 +15,4 @@ FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += cpp

 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+EATURES_MCU_GROUP = cortex_m4_1
--- a/boards/msbiot/Makefile.features
+++ b/boards/msbiot/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_m4
+FEATURES_MCU_GROUP = cortex_m4_1
--- a/boards/mulle/Makefile.features
+++ b/boards/mulle/Makefile.features
@ -15,4 +15,4 @@ FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += cpp

 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_2
--- a/boards/nucleo-f303/Makefile.features
+++ b/boards/nucleo-f303/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_m4
+FEATURES_MCU_GROUP = cortex_m4_2
--- a/boards/nucleo-f334/Makefile.features
+++ b/boards/nucleo-f334/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_m4
+FEATURES_MCU_GROUP = cortex_m4_2
--- a/boards/nucleo-f401/Makefile.features
+++ b/boards/nucleo-f401/Makefile.features
@ -4,4 +4,4 @@ FEATURES_PROVIDED += periph_gpio
 FEATURES_PROVIDED += periph_spi
 FEATURES_PROVIDED += periph_cpuid
 FEATURES_PROVIDED += periph_timer
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_2
--- a/boards/pba-d-01-kw2x/Makefile.features
+++ b/boards/pba-d-01-kw2x/Makefile.features
@ -14,4 +14,4 @@ FEATURES_PROVIDED += periph_uart
 # Various other features (if any)

 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_1
--- a/boards/slwstk6220a/Makefile.features
+++ b/boards/slwstk6220a/Makefile.features
@ -5,4 +5,4 @@ FEATURES_PROVIDED += periph_gpio
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart

-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_1
--- a/boards/stm32f3discovery/Makefile.features
+++ b/boards/stm32f3discovery/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_m4
+FEATURES_MCU_GROUP = cortex_m4_1
--- a/boards/stm32f4discovery/Makefile.features
+++ b/boards/stm32f4discovery/Makefile.features
@ -15,7 +15,7 @@ FEATURES_PROVIDED += cpp
 FEATURES_PROVIDED += arduino

 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_2

 # TODO: re-think concept for conflicts based on actual used peripherals...
 FEATURES_CONFLICT += periph_spi:periph_dac
--- a/dist/tools/drone-scripts/build_and_test.sh
+++ b/dist/tools/drone-scripts/build_and_test.sh
@ -66,7 +66,7 @@ if $FULL_CHECK; then
    # output)
    parallel -k exec_build_func {} "$@"  ::: static-tests avr8 msp430 x86 arm7 \
                                             cortex_m0 cortex_m3_1 cortex_m3_2 \
-                                             cortex_m4 \
+                                             cortex_m4_1 cortex_m4_2 \
    |& tee -a "$MYTMPDIR/output.log"
 else
    echo "PR not ready for CI build. Only static-tests will be executed!"
--- a/dist/tools/travis-scripts/get-pkg-list.py
+++ b/dist/tools/travis-scripts/get-pkg-list.py
@ -20,7 +20,8 @@

 import os

-arm_mcu_groups = ["arm7", "cortex_m0", "cortex_m3_1", "cortex_m3_2", "cortex_m4"]
+arm_mcu_groups = ["arm7", "cortex_m0", "cortex_m3_1", "cortex_m3_2",
+                  "cortex_m4_1", "cortex_m4_2"]
 msp_mcu_groups = ["msp430"]
 x86_mcu_groups = ["x86"]
 avr8_mcu_groups = ["avr8"]