From 2da05c83c4aacb6a99885c1b00d858d080bf48ae Mon Sep 17 00:00:00 2001
From: Thomas Desvenain <thomas.desvenain@gmail.com>
Date: Fri, 22 Jul 2016 12:45:56 +0200
Subject: Added a doc entry and a test for jdk general parameter

Change-Id: I8e42e0a10f1fba2fd0e2931481f5e720be278b9d
---
 jenkins_jobs/modules/general.py    |  3 +++
 tests/general/fixtures/jdk001.xml  | 10 ++++++++++
 tests/general/fixtures/jdk001.yaml |  3 +++
 3 files changed, 16 insertions(+)
 create mode 100644 tests/general/fixtures/jdk001.xml
 create mode 100644 tests/general/fixtures/jdk001.yaml

diff --git a/jenkins_jobs/modules/general.py b/jenkins_jobs/modules/general.py
index 8b6db3c9..b1268c13 100644
--- a/jenkins_jobs/modules/general.py
+++ b/jenkins_jobs/modules/general.py
@@ -97,6 +97,9 @@ Example:
       **Deprecated on jenkins >=1.637**: use the ``build-discarder``
       property instead
 
+    * **jdk**:
+      The name of the jdk to use
+
     * **raw**:
       If present, this section should contain a single **xml** entry. This XML
       will be inserted at the top-level of the :ref:`Job` definition.
diff --git a/tests/general/fixtures/jdk001.xml b/tests/general/fixtures/jdk001.xml
new file mode 100644
index 00000000..04c5c969
--- /dev/null
+++ b/tests/general/fixtures/jdk001.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <jdk>OpenJDK1.8</jdk>
+  <actions/>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <canRoam>true</canRoam>
+</project>
diff --git a/tests/general/fixtures/jdk001.yaml b/tests/general/fixtures/jdk001.yaml
new file mode 100644
index 00000000..c4c0e8fd
--- /dev/null
+++ b/tests/general/fixtures/jdk001.yaml
@@ -0,0 +1,3 @@
+name: jdk-project
+project-type: freestyle
+jdk: OpenJDK1.8
-- 
cgit