Skip to content

Commit 080f7ad

Browse files
committed
.cci.jenkinsfile: switch to building using OSBuild
Now that OSBuild is the default let's call it directly for all artifacts we can. This can all be done in a single call to `cosa osbuild` now. This also adds artifacts to build here that we weren't before to try to be more exhaustive.
1 parent 07c46f9 commit 080f7ad

1 file changed

Lines changed: 9 additions & 10 deletions

File tree

.cci.jenkinsfile

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,19 @@ pod(image: imageName + ":latest", kvm: true, cpu: "${cpuCount}", memory: "${memo
2929
// Run stage Kola QEMU (basic-qemu-scenarios, upgrade and self tests)
3030
kola(cosaDir: "/srv", addExtTests: ["${env.WORKSPACE}/ci/run-kola-self-tests"])
3131

32-
stage("Build Metal/Live Artifacts") {
33-
utils.cosaCmd(cosaDir: "/srv", args: "osbuild metal metal4k live")
34-
}
35-
36-
kolaTestIso(cosaDir: "/srv")
37-
38-
stage("Build Cloud Images") {
39-
cosaParallelCmds(cosaDir: "/srv", commands: ["Aliyun", "AWS", "Azure", "DigitalOcean", "Exoscale", "GCP",
40-
"IBMCloud", "OpenStack", "VMware", "Vultr"])
41-
32+
stage("Build Artifacts") {
33+
def artifacts = ["aliyun", "applehv", "aws", "azure", "azurestack",
34+
"digitalocean", "exoscale", "gcp", "hetzner", "hyperv",
35+
"ibmcloud", "kubevirt", "live", "metal", "metal4k",
36+
"nutanix", "openstack", "vultr"]
37+
utils.cosaCmd(cosaDir: "/srv", args: "osbuild ${artifacts.join(' ')}")
38+
cosaParallelCmds(cosaDir: "/srv", commands: ["vmware", "virtualbox"])
4239
// quick schema validation
4340
utils.cosaCmd(cosaDir: "/srv", args: "meta --get name")
4441
}
4542

43+
kolaTestIso(cosaDir: "/srv")
44+
4645
stage("Compress") {
4746
utils.cosaCmd(cosaDir: "/srv", args: "compress --fast")
4847
}

0 commit comments

Comments
 (0)