Convert rtd merge job into a global template

There's at least 2 projects that need this job now so make it reusable
globally.

Change-Id: I6287d847e3e3dd8c0b93788030e0cf19a82893b5
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index 4ffb0052add2128899ee1ff2836db9374790392e..f48e2b6e1bad303b641be09ccc18d48f0c2a3909 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -83,3 +83,38 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+
+- job-template:
+    name: '{name}-merge-rtd-{stream}'
+    # Template for ReadTheDocs triggering
+
+    project-type: freestyle
+    node: dynamic_verify
+    concurrent: false
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-merged:
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - shell: |
+            curl -X POST https://readthedocs.org/build/{rtdproject}
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'

diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
index b88a2564360aa5571f5e60f2f57c940ce56ad90a..8179720eb9bd7a982d69604e0a94b46c87a4d7a0 100644 (file)
--- a/jjb/spectrometer/spectrometer-jobs.yaml
+++ b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -1,7 +1,7 @@
 - project:
     name: spectrometer
     jobs:
-        - 'spectrometer-merge-{stream}'
+        - '{name}-merge-rtd-{stream}'
         - '{name}-verify-python-{stream}'
 
     stream:
@@ -9,44 +9,5 @@
             branch: 'master'
 
     project: 'spectrometer'
+    rtdproject: 'opendaylight-spectrometer'
     toxdir: server
-
-- job-template:
-    name: 'spectrometer-merge-{stream}'
-
-    project-type: freestyle
-    node: dynamic_verify
-    concurrent: true
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - gerrit-refspec-parameter:
-            refspec: 'refs/heads/{branch}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - gerrit-trigger-patch-merged:
-            name: 'spectrometer'
-            branch: '{branch}'
-
-    builders:
-        - shell: |
-            wget --post-data=test -qO- https://readthedocs.org/build/opendaylight-spectrometer &> /dev/null
-
-    publishers:
-        - email-notification:
-            email-prefix: '[spectrometer]'