Merge "Add test-suites option to run specific suites"

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

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 65fb04a2190c8f6d1e92738f51aeda2fe7adb598..da3ee65d1d68febf98d24fd3466415b66d39439f 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -7,17 +7,21 @@
       - '{project-name}-verify-tox-{stream}'
 
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
+          jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
       - boron:
           branch: 'stable/boron'
-      - beryllium:
-          branch: 'stable/beryllium'
 
     project: docs
     project-name: docs
     rtdproject: opendaylight
-    archive-artifacts: 'docs/_build/html/**'
+    archive-artifacts: ''
 
 - job-template:
     name: 'docs-merge-rtd-{stream}'
@@ -31,6 +35,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -64,13 +69,13 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[docs]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - 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
 
@@ -80,6 +85,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -112,14 +118,19 @@
       - shell: |
           virtualenv $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
-          pip install --upgrade pip
-          pip freeze
-          pip install tox
+          PYTHON="$WORKSPACE/venv/bin/python"
+          $PYTHON -m pip install --upgrade pip
+          $PYTHON -m pip install --upgrade pipdeptree
+          $PYTHON -m pip install tox
+          pipdeptree
           tox -edocs
 
+          # Archive generated docs
+          mkdir -p "$WORKSPACE/archives"
+          mv docs/_build/html archives/
+
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[docs]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish