From 93f45563e00f805acb5012c7e91498573da441d3 Mon Sep 17 00:00:00 2001
From: Sebastien Besson <seb.besson@gmail.com>
Date: Tue, 12 Sep 2017 16:41:29 +0100
Subject: [PATCH 1/5] Add OMERO-docs job to the devspace

This job can be used to review documentation PRs alongside the code PR provided
that the same development branch exists on the documentation repository.
---
 home/jobs/OMERO-docs/config.xml | 81 +++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 home/jobs/OMERO-docs/config.xml

diff --git a/home/jobs/OMERO-docs/config.xml b/home/jobs/OMERO-docs/config.xml
new file mode 100644
index 00000000..dd4c2005
--- /dev/null
+++ b/home/jobs/OMERO-docs/config.xml
@@ -0,0 +1,81 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>-1</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>2</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>MERGE_COMMAND</name>
+          <description></description>
+          <defaultValue>merge SPACENAME --no-ask --reset</defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@3.2.0">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <url>https://github.com/openmicroscopy/ome-documentation</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>SPACEBRANCH</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+        <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+     <submoduleCfg class="list"/>
+     <extensions>
+      </hudson.plugins.git.extensions.impl.SubmoduleOption>
+      <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
+        <relativeTargetDir>src</relativeTargetDir>
+      </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
+      <hudson.plugins.git.extensions.impl.CleanCheckout/>
+    </extensions>
+  </scm>
+  <assignedNode>testintegration</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>pip install --user scc
+test -e src &amp;&amp; cd src
+$HOME/.local/bin/scc $MERGE_COMMAND
+
+pip install --user docutils==0.12</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Ant plugin="ant@1.4">
+      <targets>clean html</targets>
+      <antName>Ant 1.9</antName>
+      <buildFile>src/omero/build.xml</buildFile>
+    </hudson.tasks.Ant>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>src/omero/_build/html/**</artifacts>
+      <allowEmptyArchive>false</allowEmptyArchive>
+      <onlyIfSuccessful>false</onlyIfSuccessful>
+      <fingerprint>false</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+      <caseSensitive>true</caseSensitive>
+    </hudson.tasks.ArtifactArchiver>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.8"/>
+  </buildWrappers>
+</project>
\ No newline at end of file

From 4b0a8d3bc9337a6791d1a208a71d617c68c014a0 Mon Sep 17 00:00:00 2001
From: Sebastien Besson <seb.besson@gmail.com>
Date: Tue, 12 Sep 2017 16:44:37 +0100
Subject: [PATCH 2/5] Add docs job to Trigger and main README

---
 README.md                    | 1 +
 home/jobs/Trigger/config.xml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/README.md b/README.md
index a75aee05..efa5165a 100644
--- a/README.md
+++ b/README.md
@@ -209,6 +209,7 @@ they are associated with and a short description of the job:
 | OMERO-test-integration | testintegration | Runs the OMERO integration tests          |
 | OMERO-robot            | testintegration | Runs the Robot tests                      |
 | nginx                  | nginx           | Reloads the nginx server                  |
+| OMERO-docs             | testintegration | Builds the OMERO documentation            |
 
 
 Default packages:
diff --git a/home/jobs/Trigger/config.xml b/home/jobs/Trigger/config.xml
index 20499352..f023c0b9 100644
--- a/home/jobs/Trigger/config.xml
+++ b/home/jobs/Trigger/config.xml
@@ -33,6 +33,8 @@ build job: &apos;OMERO-test-integration&apos;, propagate: false
 
 build job: &apos;OMERO-robot&apos;, wait: false
 
+build job: &apos;OMERO-docs&apos;, wait: false
+
 </script>
     <sandbox>false</sandbox>
   </definition>

From c9674b9fab70aac3c5c81835897d3036e086143a Mon Sep 17 00:00:00 2001
From: Sebastien Besson <seb.besson@gmail.com>
Date: Tue, 12 Sep 2017 16:50:13 +0100
Subject: [PATCH 3/5] Uncap Sphinx dependency in slave Dockerfile

---
 slave/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/slave/Dockerfile b/slave/Dockerfile
index ba97d29e..37e4d9fb 100644
--- a/slave/Dockerfile
+++ b/slave/Dockerfile
@@ -45,8 +45,7 @@ WORKDIR /tmp/omero-install/linux
 
 RUN JAVAVER=$JAVAVER ICEVER=$ICEVER PGVER=nopg bash install_centos7_nginx.sh
 
-# install sphinx - minimum required
-RUN pip install sphinx==1.2.3
+RUN pip install Sphinx
 
 # Install FindBugs
 ENV FINDBUGS_VERSION 3.0.0

From fbd60fcf04fa73a40fd497164f32d16a523ab8c5 Mon Sep 17 00:00:00 2001
From: Sebastien Besson <seb.besson@gmail.com>
Date: Tue, 12 Sep 2017 16:54:47 +0100
Subject: [PATCH 4/5] Remove docutils workaround

---
 home/jobs/OMERO-docs/config.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/home/jobs/OMERO-docs/config.xml b/home/jobs/OMERO-docs/config.xml
index dd4c2005..ae2b808f 100644
--- a/home/jobs/OMERO-docs/config.xml
+++ b/home/jobs/OMERO-docs/config.xml
@@ -55,9 +55,7 @@
     <hudson.tasks.Shell>
       <command>pip install --user scc
 test -e src &amp;&amp; cd src
-$HOME/.local/bin/scc $MERGE_COMMAND
-
-pip install --user docutils==0.12</command>
+$HOME/.local/bin/scc $MERGE_COMMAND</command>
     </hudson.tasks.Shell>
     <hudson.tasks.Ant plugin="ant@1.4">
       <targets>clean html</targets>

From cccc1b1400d9ebb3c9c29fe1915558cba9c7e050 Mon Sep 17 00:00:00 2001
From: Sebastien Besson <seb.besson@gmail.com>
Date: Tue, 19 Sep 2017 09:41:22 +0100
Subject: [PATCH 5/5] Port changes from the test devspace

---
 home/jobs/OMERO-docs/config.xml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/home/jobs/OMERO-docs/config.xml b/home/jobs/OMERO-docs/config.xml
index ae2b808f..376235b3 100644
--- a/home/jobs/OMERO-docs/config.xml
+++ b/home/jobs/OMERO-docs/config.xml
@@ -34,13 +34,9 @@
         <name>SPACEBRANCH</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
-        <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-     <submoduleCfg class="list"/>
-     <extensions>
-      </hudson.plugins.git.extensions.impl.SubmoduleOption>
-      <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-        <relativeTargetDir>src</relativeTargetDir>
-      </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <submoduleCfg class="list"/>
+    <extensions>
       <hudson.plugins.git.extensions.impl.CleanCheckout/>
     </extensions>
   </scm>
@@ -60,12 +56,12 @@ $HOME/.local/bin/scc $MERGE_COMMAND</command>
     <hudson.tasks.Ant plugin="ant@1.4">
       <targets>clean html</targets>
       <antName>Ant 1.9</antName>
-      <buildFile>src/omero/build.xml</buildFile>
+      <buildFile>omero/build.xml</buildFile>
     </hudson.tasks.Ant>
   </builders>
   <publishers>
     <hudson.tasks.ArtifactArchiver>
-      <artifacts>src/omero/_build/html/**</artifacts>
+      <artifacts>omero/_build/html/**</artifacts>
       <allowEmptyArchive>false</allowEmptyArchive>
       <onlyIfSuccessful>false</onlyIfSuccessful>
       <fingerprint>false</fingerprint>