From: Eric Ball <eball@linuxfoundation.org>
Date: Thu, 19 Aug 2021 21:58:20 +0000 (-0700)
Subject: Fix: Labels should always include config name
X-Git-Tag: v0.65.3
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;ds=inline;h=21fb4ad7453a9452de6f33e83021a3ff09b06be9;p=releng%2Fglobal-jjb.git

Fix: Labels should always include config name

Openstack labels need to include the config name, in addition to any
labels explicitly defined. This also changes the builder name to
match the config name, rather than using the labels (which can be
only one label, but is technically a space-separated list).

Change-Id: I29ccc9987aa02d1e96930d165908396b46223fa8
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---

diff --git a/jenkins-admin/create_jenkins_clouds_openstack_yaml.py b/jenkins-admin/create_jenkins_clouds_openstack_yaml.py
index ec11f455..50c4c038 100755
--- a/jenkins-admin/create_jenkins_clouds_openstack_yaml.py
+++ b/jenkins-admin/create_jenkins_clouds_openstack_yaml.py
@@ -97,7 +97,7 @@ jenkins:
 """
 machinetemplate = """\
           - labels: {{ labels }}
-            name: {{ name_prefix }}-{{ labels }}
+            name: {{ name_prefix }}-{{ agent_name }}
             slaveOptions:
               bootSource:
                 {{ image_type }}:
@@ -201,14 +201,19 @@ for section in config_parser_merged.sections():
                 value = lookuptable[value]
             section_all_machines[key] = value
 
-        # Default volume size of 10
         if "volume_size" not in section_all_machines:
             section_all_machines.update(image_type="image")
         else:
             section_all_machines.update(image_type="volumeFromImage")
+
+        # Naming and labels
+        section_all_machines.update(agent_name=section)
         if "labels" not in section_all_machines:
             # "section" is the name of the cloud agent, which is the default label
             section_all_machines.update(labels=section)
+        elif section not in section_all_machines["labels"]:
+            labels = section + " " + section_all_machines["labels"]
+            section_all_machines.update(labels=labels)
 
         j2_template = Template(machinetemplate)
         section_all_machines.update(name_prefix=name_prefix)
diff --git a/releasenotes/notes/fix-openstack-labels-750d2ca73ff0ea29.yaml b/releasenotes/notes/fix-openstack-labels-750d2ca73ff0ea29.yaml
new file mode 100644
index 00000000..83509998
--- /dev/null
+++ b/releasenotes/notes/fix-openstack-labels-750d2ca73ff0ea29.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Openstack labels need to include the config name, in addition to any
+    labels explicitly defined. This also changes the builder name to
+    match the config name, rather than using the labels (which can be
+    only one label, but is technically a space-separated list).