Fixing the libraries and outputs
diff --git a/jenkins/client.sls b/jenkins/client.sls
index 80cf45f..0228894 100644
--- a/jenkins/client.sls
+++ b/jenkins/client.sls
@@ -59,7 +59,7 @@
jenkins_job_{{ job_name }}_ensure:
jenkins.present:
- name: {{ job_name }}
- - config: salt://_jenkins_jobs/{{ job_name }}.xml
+ - config: salt://_jenkins/cache/{{ job_name }}.xml
- require:
- file: {{ client.dir.salt_root }}/_jenkins/cache/{{ job_name }}.xml
diff --git a/jenkins/files/jobs/workflow.xml b/jenkins/files/jobs/workflow.xml
index ce3faae..8533c88 100644
--- a/jenkins/files/jobs/workflow.xml
+++ b/jenkins/files/jobs/workflow.xml
@@ -1,14 +1,14 @@
-{%- from "jenkins/map.jinja" import client with context %}
+<?xml version='1.0' encoding='UTF-8'?>
+{%- from "jenkins/map.jinja" import client with context -%}
{%- set job = salt['pillar.get']('jenkins:client:job:'+job_name) -%}
-{%- macro load_groovy_file() %}
+{%- macro load_groovy_file() -%}
{%- set groovy_file='_jenkins/jobs/'+job.script.repository+'/'+job.script.file %}
{%- include groovy_file %}
-{%- endmacro %}
-{%- macro load_groovy_lib(lib) %}
+{%- endmacro -%}
+{%- macro load_groovy_lib(lib) -%}
{%- set groovy_file='_jenkins/jobs/'+lib.repository+'/'+lib.file %}
{%- include groovy_file %}
-{%- endmacro %}
-<?xml version='1.0' encoding='UTF-8'?>
+{%- endmacro -%}
<flow-definition plugin="workflow-job@2.5">
<description>
Salt generated project, do not edit. Changes will be overwritten.
diff --git a/jenkins/map.jinja b/jenkins/map.jinja
index efe6814..fec0724 100644
--- a/jenkins/map.jinja
+++ b/jenkins/map.jinja
@@ -58,7 +58,7 @@
},
}, merge=salt['pillar.get']('jenkins:slave')) %}
-{% set param = {'bool': 'Boolean', 'string': 'String', 'text': 'Text'} %}
+{% set param = {'bool': 'Boolean', 'string': 'String', 'text': 'Text', 'choice': 'Choice'} %}
{% set client = salt['grains.filter_by']({
'Debian': {