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

diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index ece856903..598ff5b2f 100644
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -1,24 +1,22 @@
 ---
 - 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:
+      - '{project-name}-rtd-jobs'
       - 'docs-merge-rtd-{stream}'
       - 'docs-verify-rtd-{stream}'
 
     stream:
       - master:
           branch: 'master'
-      - fraser:
-          branch: 'stable/{stream}'
-      - danube:
-          branch: 'stable/{stream}'
-      - euphrates:
+      - hunter:
           branch: 'stable/{stream}'
 
-    project: 'opnfvdocs'
-    rtdproject: 'opnfv'
-    # TODO: Archive Artifacts
-
 - job-template:
     name: 'docs-merge-rtd-{stream}'
 
@@ -29,6 +27,8 @@
           name: SLAVE_LABEL
           default: 'lf-build1'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
@@ -41,14 +41,6 @@
 
     builders:
       - 'remove-old-docs-from-opnfv-artifacts'
-      - shell: |
-          if [ $GERRIT_BRANCH == "master" ]; then
-            RTD_BUILD_VERSION=latest
-          else
-            RTD_BUILD_VERSION=${{GERRIT_BRANCH/\//-}}
-          fi
-          curl -X POST --data "version_slug=$RTD_BUILD_VERSION" https://readthedocs.org/build/opnfvdocsdemo
-
 
 - job-template:
     name: 'docs-verify-rtd-{stream}'
@@ -60,6 +52,8 @@
           name: SLAVE_LABEL
           default: 'lf-build2'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
@@ -75,20 +69,13 @@
     triggers:
       - gerrit-trigger-patchset-created:
           server: 'gerrit.opnfv.org'
-          project: '**'
+          project: 'opnfvdocs'
           branch: '{branch}'
-          files: 'docs/**/*.*'
+          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
+          sudo -H pip install virtualenv
           virtualenv $WORKSPACE/venv
           . $WORKSPACE/venv/bin/activate
           pip install --upgrade pip