ci: build metal images in one OSBuild invocation

dustymabe · dustymabe · commit ab8fe510aa26 · 2024-11-23T09:03:11.000-05:00
We can do this all with OSBuild now so let's not run parallel
processes here. This will enable us to drop the cache snapshot
bits since we won't have two processes trying to use the cache
qcow at the same time.
diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
@@ -30,7 +30,7 @@ pod(image: imageName + ":latest", kvm: true, cpu: "${cpuCount}", memory: "${memo
     kola(cosaDir: "/srv", addExtTests: ["${env.WORKSPACE}/ci/run-kola-self-tests"])
 
     stage("Build Metal") {
-        cosaParallelCmds(cosaDir: "/srv", commands: ["metal", "metal4k"])
+        utils.cosaCmd(cosaDir: "/srv", args: "osbuild metal metal4k")
     }
 
     stage("Build Live Images") {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ pod(image: imageName + ":latest", kvm: true, cpu: "${cpuCount}", memory: "${memo`
`30`	`30`	`kola(cosaDir: "/srv", addExtTests: ["${env.WORKSPACE}/ci/run-kola-self-tests"])`
`31`	`31`
`32`	`32`	`stage("Build Metal") {`
`33`		`- cosaParallelCmds(cosaDir: "/srv", commands: ["metal", "metal4k"])`
	`33`	`+ utils.cosaCmd(cosaDir: "/srv", args: "osbuild metal metal4k")`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`stage("Build Live Images") {`