Skip to content

Commit aba5548

Browse files
committed
bump-lockfile: consolidate image building; use OSBuild
We haven't yet switched over the production streams to use OSBuild for the Live ISO/PXE yet, but I think it's time for us to go ahead and switch this job over (since `next` will be on Fedora 42 beta soon, which will be using OSBuild for live*). While we are here let's just go ahead and build all disks up front, which means less OSBuild invocations to achieve the same result with less effort because we aren't jumping in and out of supermin multiple times.
1 parent 2106873 commit aba5548

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

jobs/bump-lockfile.Jenkinsfile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -215,19 +215,17 @@ lock(resource: "bump-lockfile") {
215215
stage("${arch}:Fetch") {
216216
shwrap("cosa fetch --strict")
217217
}
218-
stage("${arch}:Build") {
219-
shwrap("cosa build --force --strict")
218+
stage("${arch}:Build OSTree") {
219+
shwrap("cosa build ostree --force --strict")
220+
}
221+
stage("${arch}:OSBuild") {
222+
shwrap("cosa osbuild qemu metal metal4k live")
220223
}
221224
def n = ncpus - 1 // remove 1 for upgrade test
222225
kola(cosaDir: env.WORKSPACE, parallel: n, arch: arch,
223226
marker: arch, allowUpgradeFail: params.ALLOW_KOLA_UPGRADE_FAILURE,
224227
skipKolaTags: stream_info.skip_kola_tags)
225-
stage("${arch}:Build Metal") {
226-
shwrap("cosa buildextend-metal")
227-
shwrap("cosa buildextend-metal4k")
228-
}
229-
stage("${arch}:Build Live") {
230-
shwrap("cosa buildextend-live --fast")
228+
stage("${arch}:Compress Metal") {
231229
// Test metal4k with an uncompressed image and
232230
// metal with a compressed one. Limit to 4G to be
233231
// good neighbours and reduce chances of getting

0 commit comments

Comments
 (0)