Skip to content

Commit c4c2cb8

Browse files
committed
config: make check_kernel_rt_mismatch_rhcos a per-stream knob
Alter the `check_kernel_rt_mismatch_rhcos` knob to be configurable per-stream instead of globally. This will allow us to skip running this mismatch check on certain streams, like development RHCOS builds based on CentOS Streams.
1 parent 788477b commit c4c2cb8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

docs/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ streams:
9999
skip_cloud_uploads: true
100100
# Use newly added support for building images using OSBuild
101101
use_osbuild: true
102+
# OPTIONAL: require kernel + kernel-rt versions to match
103+
check_kernel_rt_mismatch_rhcos: true
102104

103105
# REQUIRED: architectures to build for other than x86_64
104106
additional_arches: [aarch64, ppc64le, s390x]
@@ -262,7 +264,5 @@ clouds:
262264
misc:
263265
# OPTIONAL: whether to generate a release index
264266
generate_release_index: true
265-
# OPTIONAL: require kernel + kernel-rt versions to match
266-
check_kernel_rt_mismatch_rhcos: true
267267
# OPTIONAL: whether to run extended upgrade test kola job
268268
run_extended_upgrade_test_fcos: true

jobs/build.Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ lock(resource: "build-${params.STREAM}") {
381381
// NOTE: This approach only checks the legacy extensions and not the new extensions
382382
// container. This check can be removed for 9.3+ builds when we drop the legacy
383383
// oscontainer as the versions will be matched using `match-base-evr` in `extensions.yaml`.
384-
if (pipecfg.misc?.check_kernel_rt_mismatch_rhcos) {
384+
if (stream_info.check_kernel_rt_mismatch_rhcos) {
385385
echo("Verifying kernel + kernel-rt versions match")
386386
def build_meta = [readJSON(file: "builds/latest/${basearch}/commitmeta.json"), readJSON(file: "builds/latest/${basearch}/meta.json")]
387387
def kernel_version = build_meta[0]['ostree.linux'].split('.el')[0]

0 commit comments

Comments
 (0)