[JENKINS-60537] Fix support of pod templates with multiple labels

jenkinsci · Dec 19, 2019 · 89d6282 · 89d6282 · guipal · Jan 8, 2020
1 parent 922ecf3
commit 89d6282
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java
@@ -377,14 +377,7 @@ public Set<LabelAtom> getLabelSet() {
     }
 
     public Map<String, String> getLabelsMap() {
-        Set<LabelAtom> labelSet = getLabelSet();
-        ImmutableMap.Builder<String, String> builder = ImmutableMap.<String, String> builder();
-        if (!labelSet.isEmpty()) {
-            for (LabelAtom label : labelSet) {
-                builder.put("jenkins/label",label == null ? DEFAULT_ID : label.getName());
-            }
-        }
-        return builder.build();
+        return ImmutableMap.of("jenkins/label", label == null ? DEFAULT_ID : label);
     }
 
     @DataBoundSetter

diff --git a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateJenkinsTest.java b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateJenkinsTest.java
@@ -0,0 +1,29 @@
+package org.csanchez.jenkins.plugins.kubernetes;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.Issue;
+import org.jvnet.hudson.test.JenkinsRule;
+
+import static org.junit.Assert.assertEquals;
+
+public class PodTemplateJenkinsTest {
+    @Rule
+    public JenkinsRule j = new JenkinsRule();
+
+    @Test
+    @Issue("JENKINS-60537")
+    public void singleLabel() {
+        PodTemplate podTemplate = new PodTemplate();
+        podTemplate.setLabel("foo");
+        assertEquals("foo" , podTemplate.getLabelsMap().get("jenkins/label"));
+    }
+
+    @Test
+    @Issue("JENKINS-60537")
+    public void multiLabel() {
+        PodTemplate podTemplate = new PodTemplate();
+        podTemplate.setLabel("foo bar");
+        assertEquals("foo bar", podTemplate.getLabelsMap().get("jenkins/label"));
+    }
+}