From: Dan Mick <dmick@redhat.com>
Date: Thu, 8 Jun 2023 09:01:10 +0000 (-0700)
Subject: ansible/examples/builder.yml: set builder labels from group_vars
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0d209e78396e06d6c267582cbee7a95ad9464fc8;p=ceph-build.git

ansible/examples/builder.yml: set builder labels from group_vars

Signed-off-by: Dan Mick <dmick@redhat.com>
---

diff --git a/ansible/examples/builder.yml b/ansible/examples/builder.yml
index 2ecad6ef..858cf36b 100644
--- a/ansible/examples/builder.yml
+++ b/ansible/examples/builder.yml
@@ -17,7 +17,7 @@
     - api_uri: 'https://jenkins.ceph.com'
     - jenkins_credentials_uuid: 'jenkins-build'
     - nodename: '{{ nodename }}'
-    - labels: '{{ labels }}'
+    - labels: "{{ jenkins_labels[ansible_hostname] }}"
     - grant_sudo: true
     - osc_user: 'username'
     - osc_pass: 'password'
@@ -882,7 +882,7 @@
         # mapping from Jenkins back to whatever service created the current
         # node
         name: "{{ ansible_default_ipv4.address }}+{{ nodename }}"
-        labels: "{{ labels }}"
+        labels: "{{ labels | default('') }}"
         host: "{{ ansible_default_ipv4.address }}"
         credentialsId: "{{ jenkins_credentials_uuid }}"
         remoteFS: '/home/{{ jenkins_user }}/build'