Merge "Add new testcases in reporting page"

[releng.git] / jjb / opnfvdocs / docs-rtd.yaml

diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index 40e91ca..bf6d001 100644 (file)
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -5,10 +5,10 @@
         - 'docs-verify-rtd-{stream}'
 
     stream:
-        - danube:
+        - master:
             branch: 'master'
-        - colorado:
-            branch: 'stable/colorado'
+        - danube:
+            branch: 'stable/{stream}'
 
     project: 'opnfvdocs'
     rtdproject: 'opnfv'
@@ -35,7 +35,10 @@
         - git-scm
 
     triggers:
-        - gerrit-trigger-change-merged
+        - gerrit-trigger-change-merged:
+            project: '**'
+            branch: '{branch}'
+            files: 'docs/**/*.*'
 
     builders:
         - shell: !include-raw: docs-post-rtd.sh
@@ -48,43 +51,40 @@
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'lf-build1'
+            default: 'lf-build2'
             description: 'Slave label on Jenkins'
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
         - string:
             name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/releng
+            default: https://gerrit.opnfv.org/gerrit/opnfvdocs
             description: 'Git URL to use on this Jenkins Slave'
     scm:
-        - git-scm-gerrit
+        - git-scm-with-submodules:
+            branch: '{branch}'
 
     triggers:
         - gerrit-trigger-patchset-created:
             server: 'gerrit.opnfv.org'
             project: '**'
             branch: '{branch}'
-            files: 'docs/**/*.rst'
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
+            files: 'docs/**/*.*'
         - timed: 'H H * * *'
 
     builders:
         - shell: |
             if [ "$GERRIT_PROJECT" != "opnfvdocs" ]; then
-                cd opnfvdocs/submodules/$GERRIT_PROJECT
+                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
-            source $WORKSPACE/venv/bin/activate
+            . $WORKSPACE/venv/bin/activate
             pip install --upgrade pip
             pip freeze
             pip install tox
-            tox -edocs
\ No newline at end of file
+            tox -edocs