Skip to content

Commit 7e408da

Browse files
committed
config: add streams[].skip_disk_images
As part of openshift/enhancements#1637, we've moved OCP 4.19 to use bootimages with RHEL content only. This means that the bootimages built with OCP content will never be used in practice. Add a `skip_disk_images` knob to disable building them. We still generate the QEMU image for kola tests to run and because they're useful to debug, but we drop everything else. (Actually, we could also not generate the QEMU image either and sanity-check the OCI image with `kola run --oscontainer`, but that requires more rewiring.) We don't generate live media since I don't think the test coverage from that is meaningfully different enough from the RHEL-only variants given that the additional OCP packages are unrelated.
1 parent b3e5ab1 commit 7e408da

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

docs/config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ streams:
5959
variant: rhcos-9.0
6060
# OPTIONAL: override whether to use a versionary for this stream
6161
versionary: false
62+
# OPTIONAL: Whether to skip disk image generation and upload. This
63+
# is equivalent to listing all live artifacts and cloud platforms in
64+
# `skip_artifacts`.
65+
skip_disk_images: true
6266
stable:
6367
type: production
6468
# OPTIONAL: override cosa image to use for this stream

utils.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,11 @@ def get_artifacts_to_build(pipecfg, stream, basearch) {
425425
artifacts -= pipecfg.streams[stream].skip_artifacts?.all ?: []
426426
artifacts -= pipecfg.streams[stream].skip_artifacts?."${basearch}" ?: []
427427
}
428+
if (pipecfg.streams[stream].skip_disk_images) {
429+
// Only keep the extensions container. Note that the ostree container
430+
// and QEMU image are always built and not skippable artifacts.
431+
artifacts = artifacts.intersect(["extensions-container"])
432+
}
428433
return artifacts.unique()
429434
}
430435

0 commit comments

Comments
 (0)