From 088b6de3a1ac9eccafbda503ed4cd247d634368e Mon Sep 17 00:00:00 2001
From: Guoqiang Ding <dingguoqiang@cloudin.cn>
Date: Thu, 28 Dec 2017 17:23:36 +0800
Subject: [PATCH] Update new documentation PTI jobs

For compliance with the Project Testing Interface as described in [1].
For more detailed information, please refer to [2].

[1] https://governance.openstack.org/tc/reference/project-testing-interface.html
[2] http://lists.openstack.org/pipermail/openstack-dev/2017-December/125710.html

Change-Id: I4999e2eceb46deec1385cb6376762de9e2fbf6e3
---
 doc/requirements.txt  |  3 +++
 test-requirements.txt |  5 -----
 tox.ini               | 15 +++++++++++++--
 3 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 doc/requirements.txt

diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 000000000..fbc8a34ec
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,3 @@
+oslosphinx>=4.7.0 # Apache-2.0
+sphinx!=1.6.6,>=1.6.2 # BSD
+reno>=2.5.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 80dbb6940..87ca7e565 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,11 +7,6 @@ coverage!=4.4,>=4.0 # Apache-2.0
 docutils>=0.11 # OSI-Approved Open Source, Public Domain
 fixtures>=3.0.0 # Apache-2.0/BSD
 mock>=2.0.0 # BSD
-oslosphinx>=4.7.0 # Apache-2.0
-sphinx!=1.6.6,>=1.6.2 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 requests-mock>=1.1.0 # Apache-2.0
-
-# releasenotes
-reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 354d98dce..3ec2a86c5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -45,7 +45,12 @@ deps =
 commands = oslo_debug_helper -t tripleoclient/tests {posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/doc/requirements.txt
+commands =
+  sphinx-build -b html doc/source doc/build/html
 
 [flake8]
 show-source = True
@@ -56,4 +61,10 @@ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,rele
 commands = oslo-config-generator --config-file config-generator/undercloud.conf
 
 [testenv:releasenotes]
-commands = bash -c tools/releasenotes_tox.sh
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/doc/requirements.txt
+commands =
+  sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
+