diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-02-20 13:33:45 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-02-23 15:23:28 +0200 |
| commit | fcbebae5c89122c8b9434928532c43e477e43312 (patch) | |
| tree | c2914cdc4381f644f85772c361c5e40362bf687a | |
| parent | d813ad93c4e41f9e16fe6664b7e0e10b0390c5d8 (diff) | |
CI: update yocto targets
After updating CI with Ubuntu 20.04 -> 22.04, the host
python version is now 3.10 which is broken in gatesgarth branch:
"File "/home/qt/work/build/poky/bitbake/lib/bb/persist_data.py", line 22, in <module>
from collections import Mapping
ImportError: cannot import name 'Mapping' from 'collections' (/usr/lib/python3.10/collections/__init__.py)"
Also, CI build against master branch has been on hiatus for a while due meta-python2 lacking
layer support for langdale onwards.
Update CI targets by adding LAYERSERIES_COMPAT override for meta-python2 layer to
support newer yocto branches, drop the old EOL yocto branches (gatesgarth, hardknott, honister)
and replace with more recent kirkstone & langdale. Re-enable master branch.
Change-Id: Ia72fb6c45b7a4f489b0e4d5f3512e8a357231d2b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Reviewed-by: Janne Juntunen <janne.juntunen@qt.io>
| -rw-r--r-- | coin/module_config.yaml | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 3f7f7976..4aea974e 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -15,9 +15,9 @@ machine_type: # Target build matrix: # -# [target1] [target2] [target3] [target4] [target5] -# [machine] qemuarm64 qemux86 qemuarm qemux86-64 qemuarm64 -# [yocto] gatesgarth dunfell hardknott honister master +# [target1] [target2] [target3] [target4] +# [machine] qemuarm64 qemux86 qemuarm qemux86-64 +# [yocto] kirkstone dunfell langdale master # target1: &target1 @@ -28,7 +28,7 @@ target1: &target1 variableValue: qemuarm64 - type: EnvironmentVariable variableName: MANIFEST - variableValue: gatesgarth.xml + variableValue: kirkstone.xml - type: EnvironmentVariable variableName: TEST_CONFIGS variableValue: ci configs @@ -60,7 +60,7 @@ target3: &target3 variableValue: qemuarm - type: EnvironmentVariable variableName: MANIFEST - variableValue: hardknott.xml + variableValue: langdale.xml - type: EnvironmentVariable variableName: TEST_CONFIGS variableValue: ci configs @@ -76,22 +76,6 @@ target4: &target4 variableValue: qemux86-64 - type: EnvironmentVariable variableName: MANIFEST - variableValue: honister.xml - - type: EnvironmentVariable - variableName: TEST_CONFIGS - variableValue: ci configs - enable_if: - condition: property - property: target.arch - equals_value: TARGET4 -target5: &target5 - type: Group - instructions: - - type: EnvironmentVariable - variableName: MACHINE - variableValue: qemuarm64 - - type: EnvironmentVariable - variableName: MANIFEST variableValue: master.xml - type: EnvironmentVariable variableName: TEST_CONFIGS @@ -99,7 +83,7 @@ target5: &target5 enable_if: condition: property property: target.arch - equals_value: TARGET5 + equals_value: TARGET4 instructions: Build: @@ -107,7 +91,6 @@ instructions: - *target2 - *target3 - *target4 - - *target5 - type: EnvironmentVariable variableName: DL_DIR variableValue: "/mnt/yocto-cache/downloads" @@ -141,6 +124,10 @@ instructions: ./repo sync source ./poky/oe-init-build-env + + # meta-python2 layer master branch compatible with kirkstone only + echo "LAYERSERIES_COMPAT_meta-python2:append = \" langdale mickledore\"" >> ../meta-python2/conf/layer.conf + bitbake-layers add-layer ../meta-openembedded/meta-oe bitbake-layers add-layer ../meta-python2 bitbake-layers add-layer ${SOURCE_DIR} |