From bac95870911f374d593d00aae6844aed334a25f3 Mon Sep 17 00:00:00 2001
From: Jessica Clarke <jrtc27@jrtc27.com>
Date: Thu, 17 Aug 2023 11:36:24 +0100
Subject: [PATCH] Jenkinsfile: Use unique boot job names for each branch

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).
---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1d275ddd04..94421d5916 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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 {