X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdocs%2Fdocs-rtd.yaml;h=4ee3c238dbb05c3a675f3e82196393369c1197a3;hb=7b80a2bb2c004a4fd29c36c337de01610b718446;hp=edfbb7c48b188bc732b80954166cf11f324ba4a7;hpb=b8eea3835e3eaedae870e763d58397dd4428bc97;p=releng%2Fbuilder.git

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index edfbb7c48..4ee3c238d 100644
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -22,8 +22,9 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -38,7 +39,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -51,26 +52,28 @@
                     branch-pattern: '**/{branch}'
                 file-paths:
                     - compare-type: ANT
-                      pattern: docs/**
+                      pattern: docs/**/*.rst
 
     builders:
-        - shell: |
-            curl -X POST https://readthedocs.org/build/{rtdproject}
+        - shell: !include-raw: docs-post-rtd.sh
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[docs]'
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
+    # FIXME: Describe this job in docs/jenkins.rst
     name: 'docs-verify-rtd-{stream}'
     node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -88,25 +91,11 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'true'
-                    exclude-trivial-rebase: 'true'
-                    exclude-no-code-change: 'true'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '**'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: docs/**
+        - gerrit-trigger-patch-submitted:
+            server: '{server-name}'
+            project: '**'
+            branch: '{branch}'
+            files: 'docs/**/*.rst'
         - timed: 'H H * * *'
 
     builders:
@@ -127,6 +116,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[docs]'
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'