From 37f923f40d5a735f5bc67769ad1bcfb63c1abe3d Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Thu, 19 Aug 2021 14:58:20 -0700 Subject: [PATCH] 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 --- jenkins-admin/create_jenkins_clouds_openstack_yaml.py | 9 +++++++-- releasenotes/notes/fix-openstack-labels-750d2ca73ff0ea29.yaml | 7 +++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/fix-openstack-labels-750d2ca73ff0ea29.yaml 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). -- 2.16.6