Improving templating

RedHat-MultiArch-QE · Aug 27, 2018 · 9c942f7 · 9c942f7
1 parent 67bd1c4
commit 9c942f7
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/src/com/redhat/multiarch/ci/provisioner/Provisioner.groovy b/src/com/redhat/multiarch/ci/provisioner/Provisioner.groovy
@@ -165,21 +165,21 @@ class Provisioner {
       templateData.job_group = config.jobgroup
       templateData.hostrequires = config.hostrequires
       templateData.hooks = [postUp: [connectToMaster: config.runOnSlave]]
-      templateData.extra_vars = '{' +
-        '"rpm_key_imports":[],' +
-        '"jenkins_master_repositories":[],' +
-        '"jenkins_master_download_repositories":[],' +
-        '"jslave_name":"' + "${host.name}"                                + '",' +
-        '"jslave_label":"' + "${host.name}"                               + '",' +
-        '"arch":"' + "${host.arch}"                                       + '",' +
-        '"jenkins_master_url":"' + "${config.jenkinsMasterUrl}"           + '",' +
-        '"jenkins_slave_username":"' + "${script.JENKINS_SLAVE_USERNAME}" + '",' +
-        '"jenkins_slave_password":"' + "${script.JENKINS_SLAVE_PASSWORD}" + '",' +
-        '"jswarm_version":"3.9",' +
-        '"jswarm_filename":"swarm-client-{{ jswarm_version }}.jar",' +
-        '"jswarm_extra_args":"' + "${config.jswarmExtraArgs}" + '",' +
-        '"jenkins_slave_repositories":[{"name":"epel","mirrorlist":"https://mirrors.fedoraproject.org/metalink?arch=\$basearch&repo=epel-7"}]' +
-        '}'
+      templateData.extra_vars = [
+        "rpm_key_imports":[],
+        "jenkins_master_repositories":[],
+        "jenkins_master_download_repositories":[],
+        "jslave_name":"${host.name}",
+        "jslave_label":"${host.name}",
+        "arch":"${host.arch}",
+        "jenkins_master_url":"${config.jenkinsMasterUrl}",
+        "jenkins_slave_username":"${script.JENKINS_SLAVE_USERNAME}",
+        "jenkins_slave_password":"${script.JENKINS_SLAVE_PASSWORD}",
+        "jswarm_version":"3.9",
+        "jswarm_filename":"swarm-client-{{ jswarm_version }}.jar",
+        "jswarm_extra_args":"${config.jswarmExtraArgs}",
+        "jenkins_slave_repositories":[["name":"epel","mirrorlist":"https://mirrors.fedoraproject.org/metalink?arch=\$basearch&repo=epel-7"]]
+      ] 
 
       def templateDataJson = JsonOutput.toJson(templateData)
       templateDataJson