Coin: extend CI coverage to yocto master branch

Add master to the CI build. Sync coin/test-configs.inc from dev regarding
qtwebengine configuration, which now needs to be disabled from gatesgarth
and dunfell.

The target machines are aligned with dev so that same targets are build
with same yocto branch. This should allow reuse of existing builds
for both branches.

Task-number: QTBUG-97065
Change-Id: I81d5ef3c554f2ebbd065283031a9c99eea6dced3
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

README.md

@@ -17,14 +17,16 @@ The branching of meta-qt6 layer follows Qt branching scheme, that is
 `dev` for the development branch, and `6.x` for each minor release.
 
 Following table shows the Yocto branches which are used to test each
-Qt version.
+Qt version (x) and any additional Yocto releases that are stated in
+the LAYERSERIES_COMPAT (c).
 
-| Yocto \ Qt | dev | 6.2 | 6.1 | 6.0 |
-| ---------- |:---:|:---:|:---:|:---:|
-| master     |  x  |     |     |     |
-| hardknott  |     |  x  |  x  |  x  |
-| gatesgarth |     |  x  |  x  |  x  |
-| dunfell    |     |  x  |  x  |  x  |
+| Yocto \ Qt | 6.2 | 6.1 | 6.0 |
+| ---------- |:---:|:---:|:---:|
+| master     |  x  |     |     |
+| honister   |  c  |     |     |
+| hardknott  |  x  |  x  |  x  |
+| gatesgarth |  x  |  x  |  x  |
+| dunfell    |  x  |  x  |  x  |
 
 QtWebEngine
 -----------

coin/module_config.yaml

@@ -17,7 +17,7 @@ machine_type:
 #
 #           [target1]       [target2]   [target3]       [target4]
 # [machine] qemuarm64       qemux86     qemuarm         qemux86-64
-# [yocto]   hardknott       dunfell     gatesgarth      dunfell
+# [yocto]   master          gatesgarth  hardknott       dunfell
 # [X11]     no              no          yes             yes
 # [mingw]   no              yes         no              no
 #
@@ -30,7 +30,7 @@ target1: &target1
       variableValue: qemuarm64
     - type: EnvironmentVariable
       variableName: YOCTO_BRANCH
-      variableValue: hardknott
+      variableValue: master
     - type: EnvironmentVariable
       variableName: DISABLE_X11
       variableValue: true
@@ -46,7 +46,7 @@ target2: &target2
       variableValue: qemux86
     - type: EnvironmentVariable
       variableName: YOCTO_BRANCH
-      variableValue: dunfell
+      variableValue: gatesgarth
     - type: EnvironmentVariable
       variableName: DISABLE_X11
       variableValue: true
@@ -65,7 +65,7 @@ target3: &target3
       variableValue: qemuarm
     - type: EnvironmentVariable
       variableName: YOCTO_BRANCH
-      variableValue: gatesgarth
+      variableValue: hardknott
   enable_if:
       condition: property
       property: target.arch

coin/test-configs.inc

@@ -33,6 +33,11 @@ WARN_QA:remove = "${EXTRA_QA}"
 PREFERRED_ARM_INSTRUCTION_SET              ?= "thumb"
 ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"
 
+# enable webengine with commercial/proprietary features
+DISTRO_FEATURES:append = " webengine"
+LICENSE_FLAGS_WHITELIST = "commercial"
+PACKAGECONFIG:append:pn-qtwebengine = " proprietary-codecs ffmpeg"
+
 PACKAGECONFIG:append:pn-qtbase = "\
     tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \
     sql-mysql sql-odbc sql-psql sql-sqlite journald brotli \
@@ -73,5 +78,6 @@ PACKAGECONFIG:append:pn-qttranslations = " examples"
 PACKAGECONFIG:append:pn-qtvirtualkeyboard = " examples"
 PACKAGECONFIG:append:pn-qtwayland = " examples"
 PACKAGECONFIG:append:pn-qtwebchannel = " examples"
+PACKAGECONFIG:append:pn-qtwebengine = " examples"
 PACKAGECONFIG:append:pn-qtwebsockets = " examples"
 PACKAGECONFIG:append:pn-qtwebview = " examples"

coin/test-dunfell.inc

@@ -0,0 +1 @@
+DISTRO_FEATURES_remove = "webengine"

coin/test-gatesgarth.inc

@@ -0,0 +1 @@
+DISTRO_FEATURES_remove = "webengine"

coin/test-hardknott.inc

@@ -1,3 +0,0 @@
-DISTRO_FEATURES:append = " webengine"
-LICENSE_FLAGS_WHITELIST = "commercial"
-PACKAGECONFIG:append:pn-qtwebengine = " examples proprietary-codecs ffmpeg"