X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdocs%2Fdocs-rtd.yaml;h=6efd20c8d5595a6ec778e55deee89bd2636e439d;hb=refs%2Fchanges%2F98%2F57998%2F2;hp=c1a1dd31de8229ee8c269653fe19ac986b95c177;hpb=2dd50188862522fdbd3f0066336e3855ee39796d;p=releng%2Fbuilder.git

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index c1a1dd31d..6efd20c8d 100644
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -1,19 +1,23 @@
+---
 - project:
     name: docs-rtd
     jobs:
-        - 'docs-merge-rtd-{stream}'
-        - 'docs-verify-rtd-{stream}'
+      - 'docs-merge-rtd-{stream}'
+      - 'docs-verify-rtd-{stream}'
+      - '{project-name}-verify-tox-{stream}'
 
     stream:
-        - carbon:
-            branch: 'master'
-        - boron:
-            branch: 'stable/boron'
-        - beryllium:
-            branch: 'stable/beryllium'
-
-    project: 'docs'
-    rtdproject: 'opendaylight'
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+      - boron:
+          branch: 'stable/boron'
+
+    project: docs
+    project-name: docs
+    rtdproject: opendaylight
     archive-artifacts: 'docs/_build/html/**'
 
 - job-template:
@@ -22,111 +26,104 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 14
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '30'
+      - opendaylight-infra-wrappers:
+          build-timeout: '30'
 
     triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '**'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: docs/**/*.rst
+      - gerrit:
+          server-name: '{server-name}'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '**'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: docs/**/*.rst
 
     builders:
-        - shell: |
-            curl -X POST https://readthedocs.org/build/{rtdproject}
+      - shell: !include-raw: docs-post-rtd.sh
 
     publishers:
-        - email-notification:
-            email-prefix: '[docs]'
-        - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[docs]'
+      - 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
+    concurrent: true
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 14
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - git-scm-with-submodules:
-            branch: '{branch}'
+      - git-scm-with-submodules:
+          branch: '{branch}'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          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/**/*.rst
-        - timed: 'H H * * *'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '**'
+          branch: '{branch}'
+          files: 'docs/**/*.rst'
+      - timed: 'H H * * *'
 
     builders:
-        - shell: |
-            if [ "$GERRIT_PROJECT" != "docs" ]; then
-                cd docs/submodules/$GERRIT_PROJECT
-                git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
-            else
-                git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
-            fi
-        - shell: |
-            virtualenv $WORKSPACE/venv
-            source $WORKSPACE/venv/bin/activate
-            pip install --upgrade pip
-            pip freeze
-            pip install tox
-            tox -edocs
+      - shell: |
+          if [ "$GERRIT_PROJECT" != "docs" ]; then
+              cd docs/submodules/$GERRIT_PROJECT
+              git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
+          else
+              git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
+          fi
+      - shell: |
+          virtualenv $WORKSPACE/venv
+          source $WORKSPACE/venv/bin/activate
+          pip install --upgrade pip
+          pip freeze
+          pip install tox
+          tox -edocs
 
     publishers:
-        - email-notification:
-            email-prefix: '[docs]'
-        - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[docs]'
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'