Add support for {% include %} in Jinja2 templates

This allows the use of the {% include %} tag[0] within Jinja2 templates,
with the same search path used for looking up other templates (i.e. the
one which LocalLoader is instantiated with).

[0] http://jinja.pocoo.org/docs/2.9/templates/#include

Change-Id: I0403c385ee317e1460a80a9bf717aa4712f37e2f

5 files changed, 76 insertions, 0 deletions

diff --git a/tests/yamlparser/fixtures/jinja-include01.xml b/tests/yamlparser/fixtures/jinja-include01.xml
new file mode 100644
index 00000000..de5ed018
--- /dev/null
+++ b/tests/yamlparser/fixtures/jinja-include01.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <actions/>
+  <description>&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <canRoam>true</canRoam>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>test variable
+a
+b
+c
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>
diff --git a/tests/yamlparser/fixtures/jinja-include01.yaml b/tests/yamlparser/fixtures/jinja-include01.yaml
new file mode 100644
index 00000000..c64bf778
--- /dev/null
+++ b/tests/yamlparser/fixtures/jinja-include01.yaml
@@ -0,0 +1,15 @@
+- builder:
+    name: test-builder
+    builders:
+        - shell:
+            !include-jinja2: jinja-include01.yaml.inc
+
+- job:
+    name: test-job
+    builders:
+        - test-builder:
+            var: "test variable"
+            test_list:
+                - a
+                - b
+                - c
diff --git a/tests/yamlparser/fixtures/jinja-include01.yaml.inc b/tests/yamlparser/fixtures/jinja-include01.yaml.inc
new file mode 100644
index 00000000..7fbaa1cb
--- /dev/null
+++ b/tests/yamlparser/fixtures/jinja-include01.yaml.inc
@@ -0,0 +1 @@
+{% include 'jinja01.yaml.inc' %}
diff --git a/tests/yamlparser/fixtures/jinja-include02.xml b/tests/yamlparser/fixtures/jinja-include02.xml
new file mode 100644
index 00000000..de5ed018
--- /dev/null
+++ b/tests/yamlparser/fixtures/jinja-include02.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <actions/>
+  <description>&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <canRoam>true</canRoam>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>test variable
+a
+b
+c
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>
diff --git a/tests/yamlparser/fixtures/jinja-include02.yaml b/tests/yamlparser/fixtures/jinja-include02.yaml
new file mode 100644
index 00000000..25a43d50
--- /dev/null
+++ b/tests/yamlparser/fixtures/jinja-include02.yaml
@@ -0,0 +1,14 @@
+- builder:
+    name: test-builder
+    builders:
+        - shell: !j2: "{% include 'jinja01.yaml.inc' %}"
+
+- job:
+    name: test-job
+    builders:
+        - test-builder:
+            var: "test variable"
+            test_list:
+                - a
+                - b
+                - c