From a4d75e379dabd296ce021bea4e7f5d9f31f1f559 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Fri, 9 Dec 2022 10:27:43 +0100
Subject: [PATCH] Fix tox.ini
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

It leverages upper constraints and an updated jjb.

Change-Id: I890acf8bf36a447e2fcd137cd1cd9e54d7cf5937
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/releng/releng-jobs.yaml                    |  2 +-
 docs/requirements.txt => test-requirements.txt |  1 +
 tox.ini                                        | 25 +++++++++----------------
 3 files changed, 11 insertions(+), 17 deletions(-)
 rename docs/requirements.txt => test-requirements.txt (73%)

diff --git a/jjb/releng/releng-jobs.yaml b/jjb/releng/releng-jobs.yaml
index 17cc473b4..bdebf3d33 100644
--- a/jjb/releng/releng-jobs.yaml
+++ b/jjb/releng/releng-jobs.yaml
@@ -150,7 +150,7 @@
             -o DPkg::Lock::Timeout=300 dist-upgrade -y
           sudo DEBIAN_FRONTEND=noninteractive \
           apt-get -o DPkg::Lock::Timeout=300 install tox -y
-          tox
+          tox --recreate
 
 - parameter:
     name: releng-tox-slave
diff --git a/docs/requirements.txt b/test-requirements.txt
similarity index 73%
rename from docs/requirements.txt
rename to test-requirements.txt
index f26b04141..1c487293e 100644
--- a/docs/requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,4 @@
 lfdocs-conf
 sphinxcontrib-httpdomain
 sphinx-opnfv-theme
+jenkins-job-builder
diff --git a/tox.ini b/tox.ini
index cb6aa2698..b93d95ff5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,31 +4,24 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = jjb,docs,docs-linkcheck
+envlist = jjb,docs
 skipsdist = True
 
 [testenv]
+basepython = python3.10
 usedevelop = False
-setenv=
-  HOME = {envtmpdir}
-  PYTHONPATH = {toxinidir}
+deps =
+  -chttps://opendev.org/openstack/requirements/raw/branch/stable/zed/upper-constraints.txt
+  -r{toxinidir}/test-requirements.txt
 
 [testenv:jjb]
-basepython = python3
-deps =
-  jenkins-job-builder==2.5.0
 commands=
-  jenkins-jobs test -o job_output -r {posargs:"jjb/"}
+  jenkins-jobs test -o {envtmpdir}/job_output -r {toxinidir}/jjb
 
 [testenv:docs]
-basepython = python3
-deps = -r{toxinidir}/docs/requirements.txt
 commands =
-    sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs {toxinidir}/docs/_build/html
-    echo "Generated docs available in {toxinidir}/docs/_build/html"
-whitelist_externals = echo
+  sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs {toxinidir}/docs/_build/html
 
 [testenv:docs-linkcheck]
-basepython = python3
-deps = -r{toxinidir}/docs/requirements.txt
-commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs {toxinidir}/docs/_build/linkcheck
+commands =
+  sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs {toxinidir}/docs/_build/linkcheck
-- 
2.16.6