Fix rtd verify for lftools

lftools docs build runs literal lftools commands
these commands are only avaliable if the current patchset
is installed.

this part is a bit of a hacke, suggestions welcome.
also, if anyone knows how this ever worked before,
id love to know.

Also, install tox so that path has python 3 version of tox
first in path.

Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Change-Id: Ic3f9bd788db851bec815e86d57a1788e7eae945a

diff --git a/shell/rtd-verify.sh b/shell/rtd-verify.sh
index 810a87c..86254a1 100644 (file)
--- a/shell/rtd-verify.sh
+++ b/shell/rtd-verify.sh
@@ -30,6 +30,11 @@ fi
 git fetch origin "$GERRIT_REFSPEC" && git checkout FETCH_HEAD
 git submodule update
 
+if [[ $JOB_NAME == "lf-infra-lftools-rtd-verify-any" ]]; then
+    # Install patchset lftools
+    python3 -m pip install --user -e .
+fi
+
 echo "---> Generating docs"
 cd "$WORKSPACE"
 tox -edocs

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index 3734a7f..83097f9 100644 (file)
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -18,9 +18,9 @@ set -eux -o pipefail
 
 
 if [[ $PYTHON == "python2" ]]; then
-    $PYTHON -m pip install --user --quiet --upgrade tox-pyenv more-itertools~=5.0.0
+    $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv more-itertools~=5.0.0
 else
-    $PYTHON -m pip install --user --quiet --upgrade tox-pyenv
+    $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv
 fi