Merge "Add quick verify job for RPM building logic"

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

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 3fd3f3ce263fb676a2d6860e2476f2f7de4481d1..dee12dace4f733aeba0115b83916e846886eb906 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -2,25 +2,22 @@
 - project:
     name: docs-rtd
     jobs:
-      - 'docs-merge-rtd-{stream}'
-      - 'docs-verify-rtd-{stream}'
-      - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-rtd-jobs'
+      - gerrit-tox-verify
 
     stream:
+      - oxygen:
+          branch: master
       - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
+          branch: stable/nitrogen
       - carbon:
-          branch: 'stable/carbon'
-      - boron:
-          branch: 'stable/boron'
-      - beryllium:
-          branch: 'stable/beryllium'
+          branch: stable/carbon
 
     project: docs
     project-name: docs
-    rtdproject: opendaylight
-    archive-artifacts: 'docs/_build/html/**'
+    build-node: centos7-java-builder-2c-4g
+    rtd-project: opendaylight
+    archive-artifacts: ''
 
 - job-template:
     name: 'docs-merge-rtd-{stream}'
@@ -68,8 +65,7 @@
       - 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
@@ -118,14 +114,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