coin: Make macOS on ARM packaging tests significant for a few modules

Not all modules pass yet, but we want to at least make the ones that
do blocking.

Change-Id: Ic3270bab8825c79d3315e6241d62af1bf7f62435
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>

5 files changed, 16 insertions, 9 deletions

diff --git a/coin/platform_configs/macos-universal-build-tests.yaml b/coin/platform_configs/macos-universal-build-tests.yaml
new file mode 100644
index 00000000..0699e052
--- /dev/null
+++ b/coin/platform_configs/macos-universal-build-tests.yaml
@@ -0,0 +1,8 @@
+Version: 2
+Configurations:
+    -
+        Id: 'macos-11-arm64-tests'
+        Template: 'qtci-macos-11.0-arm64'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml
index f40fc92d..d05277f9 100644
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -33,12 +33,6 @@ Configurations:
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
         Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-    -
-        Id: 'macos-11-arm64-tests'
-        Template: 'qtci-macos-11.0-arm64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'InsignificantTests']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
 
     # Build developer builds for all modules, but only run tests for qtbase and declarative.
     # See macos-developer-build-tests.yaml for the tests
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml
index b9623434..740ef1d7 100644
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -2,7 +2,8 @@ Version: 2
 Include: [
     cmake_platforms.yaml,
     cmake_platforms_static_tests.yaml,
-    macos-developer-build-tests.yaml
+    macos-developer-build-tests.yaml,
+    macos-universal-build-tests.yaml
 ]
 Configurations:
 -
diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml
index 03773931..be0a2497 100644
--- a/coin/platform_configs/qtdeclarative.yaml
+++ b/coin/platform_configs/qtdeclarative.yaml
@@ -1,6 +1,7 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    macos-developer-build-tests.yaml
+    macos-developer-build-tests.yaml,
+    macos-universal-build-tests.yaml
 ]
 Configurations: []
diff --git a/coin/platform_configs/qtquickcontrols2.yaml b/coin/platform_configs/qtquickcontrols2.yaml
index c3233842..af7bc176 100644
--- a/coin/platform_configs/qtquickcontrols2.yaml
+++ b/coin/platform_configs/qtquickcontrols2.yaml
@@ -1,3 +1,6 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+  cmake_platforms.yaml,
+  macos-universal-build-tests.yaml
+]
 Configurations: []