Merge "Migrate int/dist to use lf-infra-publish"

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

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 3fd3f3ce263fb676a2d6860e2476f2f7de4481d1..b87ddfec3c9fe5d6002e7dfdf14868601e191bc0 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -14,8 +14,6 @@
           branch: 'stable/carbon'
       - boron:
           branch: 'stable/boron'
-      - beryllium:
-          branch: 'stable/beryllium'
 
     project: docs
     project-name: docs
@@ -68,8 +66,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 +115,14 @@
       - 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 freeze
+          $PYTHON -m pip install tox
           tox -edocs
 
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[docs]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish