Skip to content

Commit

Permalink
Jenkinsfile: Use unique boot job names for each branch
Browse files Browse the repository at this point in the history
Otherwise we overwrite other closures in the map and the last one for
each architecture, kernel ABI and QEMU config wins (dev for dev and PRs
to dev, releng/22.12 for other non-debug QEMU configs and main for other
debug QEMU configs).
  • Loading branch information
jrtc27 authored and arichardson committed Aug 17, 2023
1 parent 4fb6c37 commit bac9587
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ def maybeArchiveArtifacts(params, String os) {
def addBootJobs(bootJobs, params, String qemuConfig, String architecture, String cheribsdBranch, String suffix="") {
// For purecap architectures we boot both hybrid and purecap kernels.
if (architecture.endsWith("-purecap")) {
bootJobs["${architecture}-purecap-kernel on ${qemuConfig}"] =
bootJobs["${architecture}-purecap-kernel${suffix} on ${qemuConfig}"] =
{ -> bootCheriBSD(params, qemuConfig, "${architecture}-purecap-kernel${suffix}", architecture,
'purecap', cheribsdBranch) }
bootJobs["${architecture}-hybrid-kernel on ${qemuConfig}"] =
bootJobs["${architecture}-hybrid-kernel${suffix} on ${qemuConfig}"] =
{ -> bootCheriBSD(params, qemuConfig, "${architecture}-hybrid-kernel${suffix}", architecture,
'hybrid', cheribsdBranch) }
} else {
Expand Down

0 comments on commit bac9587

Please sign in to comment.