Skip to content

Commit ce5cbf1

Browse files
authored
Merge branch 'main' into bugfix/containers
2 parents 24ea02e + f8e2bf5 commit ce5cbf1

17 files changed

+760
-152
lines changed

.github/workflows/main.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,32 @@ on:
1616
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1717
jobs:
1818
check:
19-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-22.04
2020
strategy:
2121
matrix:
22-
python-version: ['3.7', '3.10']
22+
python-version:
23+
- '3.7'
24+
- '3.10'
25+
- '3.13'
2326

2427
steps:
2528

2629
- name: Check out source code
27-
uses: actions/checkout@v2
30+
uses: actions/checkout@v4
2831

2932
- name: Set up Python
30-
uses: actions/setup-python@master
33+
uses: actions/setup-python@v5
3134
with:
3235
python-version: ${{ matrix.python-version }}
36+
cache: 'pip'
37+
38+
# Override version of pycodestyle for Python 3.7 to the
39+
# latest available release that can be installed on this
40+
# old Python release.
41+
- name: Override pycodestyle version
42+
if: ${{ matrix.python-version == '3.7' }}
43+
run: |
44+
echo 'pycodestyle==2.10.0' > requirements-dev.txt
3345
3446
- name: Install Python packages
3547
run: |
@@ -41,11 +53,10 @@ jobs:
4153
run: |
4254
pycodestyle src/*.py
4355
44-
- name: Install python yaml package
56+
- name: Install Python YAML package
4557
run: |
4658
pip install pyyaml
4759
48-
- name: Run basic yaml validation
60+
- name: Run basic YAML validation
4961
run: |
5062
python tests/validate_yaml.py
51-

config/jobs-chromeos.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,27 @@ _anchors:
9393
version: 6
9494
patchlevel: 6
9595

96+
baseline-cros-kernel: &baseline-cros-kernel-job
97+
template: baseline.jinja2
98+
kind: job
99+
kcidb_test_suite: boot
100+
params: &baseline-cros-kernel-params
101+
extra_kernel_args: "lsm=capability,landlock,yama,loadpin,safesetid,selinux,bpf"
102+
rules:
103+
tree:
104+
- chromiumos
105+
106+
baseline-nfs-cros-kernel: &baseline-nfs-cros-kernel-job
107+
<<: *baseline-cros-kernel-job
108+
kcidb_test_suite: boot.nfs
109+
params:
110+
<<: *baseline-cros-kernel-params
111+
boot_commands: nfs
112+
nfsroot: http://storage.kernelci.org/images/rootfs/debian/bookworm/20240313.0/{debarch}
113+
rules:
114+
tree:
115+
- chromiumos
116+
96117
tast: &tast-job
97118
template: tast.jinja2
98119
kind: job
@@ -483,6 +504,16 @@ jobs:
483504
baseline-x86-amd-staging-chromebook: *baseline-job
484505
baseline-x86-intel-chromebook: *baseline-job
485506

507+
baseline-arm64-mediatek-cros-kernel: *baseline-cros-kernel-job
508+
baseline-arm64-qualcomm-cros-kernel: *baseline-cros-kernel-job
509+
baseline-x86-amd-cros-kernel: *baseline-cros-kernel-job
510+
baseline-x86-intel-cros-kernel: *baseline-cros-kernel-job
511+
512+
baseline-nfs-arm64-mediatek-cros-kernel: *baseline-nfs-cros-kernel-job
513+
baseline-nfs-arm64-qualcomm-cros-kernel: *baseline-nfs-cros-kernel-job
514+
baseline-nfs-x86-amd-cros-kernel: *baseline-nfs-cros-kernel-job
515+
baseline-nfs-x86-intel-cros-kernel: *baseline-nfs-cros-kernel-job
516+
486517
kbuild-clang-17-arm64-chromeos-daily-mediatek:
487518
<<: *kbuild-clang-17-arm64-chromeos-job
488519
params:

config/jobs.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,10 @@ _anchors:
7575

7676
### Frequently used rules
7777

78+
# A list of trees for which to run the build-only jobs.
7879
build-only-trees-rules: &build-only-trees-rules
80+
# NOTE: Please keep the trees list in sorted order.
7981
tree:
80-
- 'qcom'
8182
- 'amlogic'
8283
- 'ardb'
8384
- 'arnd'
@@ -88,9 +89,11 @@ _anchors:
8889
- 'krzysztof'
8990
- 'lee-backlight'
9091
- 'linusw'
92+
- 'linux-pci'
9193
- 'net-next'
9294
- 'next'
9395
- 'pm'
96+
- 'qcom'
9497
- 'renesas'
9598
- 'robh'
9699
- 'rppt'
@@ -117,6 +120,7 @@ jobs:
117120
baseline-arm-broonie: *baseline-job
118121
baseline-arm-baylibre: *baseline-job
119122
baseline-arm-clabbe: *baseline-job
123+
baseline-arm-kontron: *baseline-job
120124
baseline-arm-mfd: *baseline-job
121125
baseline-arm-pengutronix: *baseline-job
122126
baseline-arm64: *baseline-job
@@ -125,6 +129,7 @@ jobs:
125129
baseline-arm64-clabbe: *baseline-job
126130
baseline-arm64-kcidebug-mediatek: *baseline-job
127131
baseline-arm64-kcidebug-qualcomm: *baseline-job
132+
baseline-arm64-kontron: *baseline-job
128133
baseline-arm64-mfd: *baseline-job
129134
baseline-arm64-pengutronix: *baseline-job
130135
baseline-arm64-qualcomm: *baseline-job

config/pipeline.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,13 @@ runtimes:
143143
callback:
144144
token: kernelci-api-token-lava-staging
145145

146+
lava-kontron:
147+
lab_type: lava
148+
url: 'https://lavalab.kontron.com'
149+
notify:
150+
callback:
151+
token: kernel-ci-callback
152+
146153
lava-pengutronix:
147154
lab_type: lava
148155
url: 'https://lava.pengutronix.de'

0 commit comments

Comments
 (0)