X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfvdocs%2Fdocs-rtd.yaml;h=f81feab22619c5166b8b873a21957475607689b1;hb=bca93c2620ec2756dd0850b1c41180aa935ed22a;hp=bf6d0012b13a9650c30b6d19ab531964e98b572d;hpb=a50c482ac46d62e5a7c5c06915e3b3d1014747ff;p=releng.git

diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index bf6d0012b..598ff5b2f 100644
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -1,18 +1,21 @@
+---
 - project:
     name: docs-rtd
+    project: 'opnfvdocs'
+    project-name: 'opnfvdocs'
+    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfvdocsdemo/79560/'
+    rtd-token: 'a96c3622a270344cf9bf3f73b0dfa04f59fc59c0'
+    project-pattern: 'opnfvdocs'
     jobs:
-        - 'docs-merge-rtd-{stream}'
-        - 'docs-verify-rtd-{stream}'
+      - '{project-name}-rtd-jobs'
+      - 'docs-merge-rtd-{stream}'
+      - 'docs-verify-rtd-{stream}'
 
     stream:
-        - master:
-            branch: 'master'
-        - danube:
-            branch: 'stable/{stream}'
-
-    project: 'opnfvdocs'
-    rtdproject: 'opnfv'
-    # TODO: Archive Artifacts
+      - master:
+          branch: 'master'
+      - hunter:
+          branch: 'stable/{stream}'
 
 - job-template:
     name: 'docs-merge-rtd-{stream}'
@@ -20,28 +23,24 @@
     project-type: freestyle
 
     parameters:
-        - label:
-            name: SLAVE_LABEL
-            default: 'lf-build1'
-            description: 'Slave label on Jenkins'
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/releng
-            description: 'Git URL to use on this Jenkins Slave'
-    scm:
-        - git-scm
+      - label:
+          name: SLAVE_LABEL
+          default: 'lf-build1'
+          description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
 
     triggers:
-        - gerrit-trigger-change-merged:
-            project: '**'
-            branch: '{branch}'
-            files: 'docs/**/*.*'
+      - gerrit-trigger-change-merged:
+          project: '**'
+          branch: '{branch}'
+          files: 'docs/**/*.*'
 
     builders:
-        - shell: !include-raw: docs-post-rtd.sh
+      - 'remove-old-docs-from-opnfv-artifacts'
 
 - job-template:
     name: 'docs-verify-rtd-{stream}'
@@ -49,42 +48,39 @@
     project-type: freestyle
 
     parameters:
-        - label:
-            name: SLAVE_LABEL
-            default: 'lf-build2'
-            description: 'Slave label on Jenkins'
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/opnfvdocs
-            description: 'Git URL to use on this Jenkins Slave'
+      - label:
+          name: SLAVE_LABEL
+          default: 'lf-build2'
+          description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/opnfvdocs
+          description: 'Git URL to use on this Jenkins Slave'
+
     scm:
-        - git-scm-with-submodules:
-            branch: '{branch}'
+      - git-scm-with-submodules:
+          branch: '{branch}'
 
     triggers:
-        - gerrit-trigger-patchset-created:
-            server: 'gerrit.opnfv.org'
-            project: '**'
-            branch: '{branch}'
-            files: 'docs/**/*.*'
-        - timed: 'H H * * *'
+      - gerrit-trigger-patchset-created:
+          server: 'gerrit.opnfv.org'
+          project: 'opnfvdocs'
+          branch: '{branch}'
+          files: 'docs/**'
 
     builders:
-        - shell: |
-            if [ "$GERRIT_PROJECT" != "opnfvdocs" ]; 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: |
-            sudo pip install virtualenv 
-            virtualenv $WORKSPACE/venv
-            . $WORKSPACE/venv/bin/activate
-            pip install --upgrade pip
-            pip freeze
-            pip install tox
-            tox -edocs
+      - shell: |
+          sudo -H pip install virtualenv
+          virtualenv $WORKSPACE/venv
+          . $WORKSPACE/venv/bin/activate
+          pip install --upgrade pip
+          pip freeze
+          pip install tox
+          sed -i s,\-b\ html,\-b\ singlehtml,g tox.ini
+          tox -edocs
+      - 'upload-review-docs'