ci: use OSbuild to build metal/metal4k in one shot

dustymabe · dustymabe · commit cd733381364b · 2024-11-24T10:01:47.000-05:00
Since we dropped runvm_with_cache_snapshot this now fails. Let's make a similar change here as what we did in coreos/coreos-assembler#3970
diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
@@ -42,10 +42,8 @@ cosaPod(cpus: 4, memory: "9Gi") {
     }
     cosaBuild(skipInit: true, noStrict: no_strict_build, extraFetchArgs: '--with-cosa-overrides', extraArgs: parent_arg)
 
-    parallel metal: {
-        shwrap("cd /srv/coreos && cosa buildextend-metal")
-    }, metal4k: {
-        shwrap("cd /srv/coreos && cosa buildextend-metal4k")
+    stage("Metal/Metal4k") {
+        shwrap("cd /srv/coreos && cosa osbuild metal metal4k")
     }
 
     stage("Test ISO") {

Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,8 @@ cosaPod(cpus: 4, memory: "9Gi") {`
`42`	`42`	`}`
`43`	`43`	`cosaBuild(skipInit: true, noStrict: no_strict_build, extraFetchArgs: '--with-cosa-overrides', extraArgs: parent_arg)`
`44`	`44`
`45`		`- parallel metal: {`
`46`		`- shwrap("cd /srv/coreos && cosa buildextend-metal")`
`47`		`- }, metal4k: {`
`48`		`- shwrap("cd /srv/coreos && cosa buildextend-metal4k")`
	`45`	`+ stage("Metal/Metal4k") {`
	`46`	`+ shwrap("cd /srv/coreos && cosa osbuild metal metal4k")`
`49`	`47`	`}`
`50`	`48`
`51`	`49`	`stage("Test ISO") {`