Skip to content

WIP: CI: move local.conf modifications into their own yaml to make them optional #839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP: CI: move local.conf modifications into their own yaml to make them optional #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7addcb
ci/distro.yml: enable meta-xfce and its dependencies
koenkooi Mar 3, 2025
6ae53e3
github workflow: build both Poky and Qcom DISTRO configs
koenkooi Mar 24, 2025
9266c4c
ci: split local.conf mods out from base.yml
koenkooi Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/build-yocto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,13 @@ jobs:
- qrb2210-rb1-core-kit
- qcom-armv8a
- qcom-armv7a
distro:
- name: poky/systemd
yamlfile: 'ci/localconfmods.yml:'
Copy link
Contributor

@ndechesne ndechesne Apr 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

localconf.yml?

- name: qcom
yamlfile: 'ci/distro.yml:'
runs-on: [self-hosted, x86]
name: ${{ matrix.machine }}/poky/systemd
name: ${{ matrix.machine }}/${{ matrix.distro.name }}
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -110,7 +115,7 @@ jobs:
export SSTATE_DIR=${CACHE_DIR}/sstate-cache
export KAS_WORK_DIR=$PWD/../kas
mkdir $KAS_WORK_DIR
kas build ci/mirror.yml:ci/${{ matrix.machine }}.yml
kas build ci/mirror.yml:${{ matrix.distro.yamlfile }}ci/${{ matrix.machine }}.yml
ci/yocto-pybootchartgui.sh && mv $KAS_WORK_DIR/build/buildchart.svg .

- uses: actions/upload-artifact@v4
Expand Down
8 changes: 0 additions & 8 deletions ci/base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,10 @@ repos:
meta-poky:

local_conf_header:
base: |
CONF_VERSION = "2"
INIT_MANAGER = "systemd"
PACKAGE_CLASSES = "package_ipk"
INHERIT += "buildstats buildstats-summary"
Copy link
Contributor

@ndechesne ndechesne Apr 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the 3 INHERIT in there, I see them as 'CI' configs that we want to enforce. I think we should keep them here.
First buildstats now is required since f6cfffd, and buildhistory I would like eventually to keep a copy of all our builds, so it would be required too.

rm_work while not needed in CI with throw away instances, is really a nice user feature, which should be kept by default too.

INHERIT += "buildhistory"
INHERIT += "rm_work"
qcomflash: |
IMAGE_CLASSES += "image_types_qcom"
IMAGE_FSTYPES += "qcomflash"
extra: |
DISTRO_FEATURES:append = " efi pni-names"
EXTRA_IMAGE_FEATURES = "allow-empty-password empty-root-password allow-root-login"
IMAGE_ROOTFS_EXTRA_SPACE = "307200"

Expand Down
10 changes: 10 additions & 0 deletions ci/distro.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,13 @@ repos:
meta-qcom-distro:
url: https://github.com/qualcomm-linux/meta-qcom-distro
branch: main

meta-openembedded:
url: https://github.com/openembedded/meta-openembedded
layers:
meta-oe:
meta-xfce:
meta-gnome:
meta-python:
meta-networking:
meta-multimedia:
15 changes: 15 additions & 0 deletions ci/localconfmods.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json

header:
version: 14

local_conf_header:
base: |
CONF_VERSION = "2"
INIT_MANAGER = "systemd"
PACKAGE_CLASSES = "package_ipk"
INHERIT += "buildstats buildstats-summary"
INHERIT += "buildhistory"
INHERIT += "rm_work"
extra: |
DISTRO_FEATURES:append = " efi pni-names"
Loading