[JENKINS-60088] set label "jenkins/label=<label>" instead of "je… (#640)

[JENKINS-60088] set label "jenkins/label=<label>" instead of "jenkins/<label>=true"
jenkinsci · Dec 13, 2019 · 33b9ee2 · 33b9ee2
2 parents cc58b4c + d990ac6
commit 33b9ee2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 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
@@ -381,7 +381,7 @@ public Map<String, String> getLabelsMap() {
         ImmutableMap.Builder<String, String> builder = ImmutableMap.<String, String> builder();
         if (!labelSet.isEmpty()) {
             for (LabelAtom label : labelSet) {
-                builder.put(label == null ? DEFAULT_ID : "jenkins/" + label.getName(), "true");
+                builder.put("jenkins/label",label == null ? DEFAULT_ID : label.getName());
             }
         }
         return builder.build();

diff --git a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java
@@ -158,12 +158,12 @@ public void runInPod() throws Exception {
         }
         assertTrue(foundBuildUrl);
         assertEquals(Integer.MAX_VALUE, template.getInstanceCap());
-        assertThat(template.getLabelsMap(), hasEntry("jenkins/" + name.getMethodName(), "true"));
+        assertThat(template.getLabelsMap(), hasEntry("jenkins/label", name.getMethodName()));
 
         Pod pod = pods.getItems().get(0);
         LOGGER.log(Level.INFO, "One pod found: {0}", pod);
         assertThat(pod.getMetadata().getLabels(), hasEntry("jenkins", "slave"));
-        assertThat("Pod labels are wrong: " + pod, pod.getMetadata().getLabels(), hasEntry("jenkins/" + name.getMethodName(), "true"));
+        assertThat("Pod labels are wrong: " + pod, pod.getMetadata().getLabels(), hasEntry("jenkins/label", name.getMethodName()));
 
         r.assertBuildStatusSuccess(r.waitForCompletion(b));
         r.assertLogContains("script file contents: ", b);
@@ -183,10 +183,10 @@ public void runIn2Pods() throws Exception {
         PodTemplate template1 = podTemplatesWithLabel(label1, cloud.getAllTemplates()).get(0);
         SemaphoreStep.success("podTemplate1/1", null);
         assertEquals(Integer.MAX_VALUE, template1.getInstanceCap());
-        assertThat(template1.getLabelsMap(), hasEntry("jenkins/" + label1, "true"));
+        assertThat(template1.getLabelsMap(), hasEntry("jenkins/label", label1));
         SemaphoreStep.waitForStart("pod1/1", b);
         Map<String, String> labels1 = getLabels(cloud, this, name);
-        labels1.put("jenkins/"+label1, "true");
+        labels1.put("jenkins/label",label1);
         PodList pods = cloud.connect().pods().withLabels(labels1).list();
         assertTrue(!pods.getItems().isEmpty());
         SemaphoreStep.success("pod1/1", null);
@@ -196,11 +196,11 @@ public void runIn2Pods() throws Exception {
         PodTemplate template2 = podTemplatesWithLabel(label2, cloud.getAllTemplates()).get(0);
         SemaphoreStep.success("podTemplate2/1", null);
         assertEquals(Integer.MAX_VALUE, template2.getInstanceCap());
-        assertThat(template2.getLabelsMap(), hasEntry("jenkins/" + label2, "true"));
+        assertThat(template2.getLabelsMap(), hasEntry("jenkins/label", label2));
         assertNull(label2 + " should not inherit from anything", template2.getInheritFrom());
         SemaphoreStep.waitForStart("pod2/1", b);
         Map<String, String> labels2 = getLabels(cloud, this, name);
-        labels1.put("jenkins/" + label2, "true");
+        labels1.put("jenkins/label", label2);
         PodList pods2 = cloud.connect().pods().withLabels(labels2).list();
         assertTrue(!pods2.getItems().isEmpty());
         SemaphoreStep.success("pod2/1", null);