Merge pull request #172 from sbesson/guides_push

Add job for merging OMERO guides

home/jobs/OMERO-guides-push/config.xml

@@ -0,0 +1,57 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="[email protected]">
+  <actions>
+    <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobAction plugin="[email protected]"/>
+    <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction plugin="[email protected]">
+      <jobProperties/>
+      <triggers/>
+      <parameters>
+        <string>STATUS</string>
+        <string>MERGE_OPTIONS</string>
+      </parameters>
+      <options/>
+    </org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction>
+  </actions>
+  <description>Run scc merge and bump versions on omero-plugins</description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>STATUS</name>
+          <description>PR check status</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>success-only</string>
+              <string>no-error</string>
+              <string>none</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>MERGE_OPTIONS</name>
+          <description>scc merge options</description>
+          <defaultValue>-vvv --no-ask --reset --comment</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="[email protected]">
+    <script>node(&apos;testintegration&apos;) {
+
+  library identifier: &apos;recursiveMerge@master&apos;, retriever: modernSCM(
+    [$class: &apos;GitSCMSource&apos;,
+     remote: &apos;git://github.com/ome/jenkins-library-recursivemerge.git&apos;])
+
+  recursiveCheckout(
+    repo: &apos;omero-guides.git&apos;)
+
+  recursiveMerge(
+    baseRepo: &apos;omero-guides.git&apos;)
+}</script>
+    <sandbox>true</sandbox>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>

home/jobs/Trigger/config.xml

@@ -96,6 +96,7 @@
         stage("OMERO Docs") {
             steps {
                 build job: 'OMERO-docs', wait: false
+                build job: 'OMERO-guides-push', wait: false
             }
         }