From: Eric Ball <eball@linuxfoundation.org>
Date: Tue, 10 Aug 2021 21:50:42 +0000 (-0700)
Subject: Fix: Use cloud agent name as default node label
X-Git-Tag: v0.65.2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;ds=sidebyside;h=refs%2Ftags%2Fv0.65.2;hp=eafdcafcbe25dbad05e5117aca20bf6ea048ac44;p=releng%2Fglobal-jjb.git

Fix: Use cloud agent name as default node label

Rather than quitting if there are no labels defined, we can instead
use the agent name (e.g. "centos7-2c-1g") as the default label. This
recreates the functionality of the groovy scripts previously used.

Issue: RELENG-3863
Change-Id: I3817cca81358fa151fdeb1bbc8516df983327965
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 4201cdb4..b200b75a 100755
--- a/jenkins-admin/create_jenkins_clouds_openstack_yaml.py
+++ b/jenkins-admin/create_jenkins_clouds_openstack_yaml.py
@@ -204,9 +204,8 @@ for section in config_parser_merged.sections():
         if "volume_size" not in section_all_machines:
             section_all_machines.update(volume_size="10")
         if "labels" not in section_all_machines:
-            print("LABELS not Set in builder config")
-            print(section_all_machines)
-            exit(1)
+            # "section" is the name of the cloud agent, which is the default label
+            section_all_machines.update(labels=section)
 
         j2_template = Template(machinetemplate)
         section_all_machines.update(name_prefix=name_prefix)
diff --git a/releasenotes/notes/fix-jcasc-openstack-bbe5b39391fe5f59.yaml b/releasenotes/notes/fix-jcasc-openstack-bbe5b39391fe5f59.yaml
new file mode 100644
index 00000000..35fbe87b
--- /dev/null
+++ b/releasenotes/notes/fix-jcasc-openstack-bbe5b39391fe5f59.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    When running create_jenkins_clouds_openstack_yaml.py, rather than quitting
+    if there are no labels defined, we can instead use the agent name
+    (e.g. "centos7-2c-1g") as the default label. This recreates the
+    functionality of the groovy scripts previously used.