From c4abc9f35e7e41a55a0bae2e06a9af7f7f6c03d6 Mon Sep 17 00:00:00 2001 From: Guillaume Lambert Date: Thu, 17 Jun 2021 11:36:01 +0200 Subject: [PATCH] Docs: remove reference to detox Detox globaljjb support was removed in a previous commit. 1873622e1b5bf98150db6850901d190dd6c35422 Parallel jobs are now natively supported by tox since version 3.7.0 thanks to the option "-p" / "--parallel". This new option offers more possibilities than detox and other options have also been introduced to tune tox behavior in parallel mode. The configuration choices made in globaljjb must be clarified. Signed-off-by: Guillaume Lambert Change-Id: I82c88ea96ee1332b95ab13f0b7dbf2a04e00f37a --- docs/jjb/lf-python-jobs.rst | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/docs/jjb/lf-python-jobs.rst b/docs/jjb/lf-python-jobs.rst index 0f02b428..48f35884 100644 --- a/docs/jjb/lf-python-jobs.rst +++ b/docs/jjb/lf-python-jobs.rst @@ -43,8 +43,8 @@ Creates a Tox virtual environment and invokes tox. :Required Parameters: - :parallel: Boolean. If true use detox (distributed tox); - else use regular tox. + :parallel: Boolean. If true use tox with the options "--parallel auto" + and "--parallel-live" to parallelize jobs in the envlist; Job Templates @@ -202,6 +202,8 @@ https://docs.sonarqube.org/display/PLUG/Python+Coverage+Results+Import :mvn-version: Version of maven to use. (default: mvn35) :parallel: Boolean indicator for tox to run tests in parallel or series. (default: false, in series) + If true use tox with the options "--parallel auto" and "--parallel-live" + to parallelize jobs in the envlist. :pre-build-script: Shell script to execute before the Sonar builder. For example, install prerequisites or move files to the repo root. (default: a string with a shell comment) @@ -293,6 +295,8 @@ Plug-in configurations :github-url: URL for Github. (default: https://github.com) :parallel: Boolean indicator for tox to run tests in parallel or series. (default: false, in series) + If true use tox with the options "--parallel auto" and "--parallel-live" + to parallelize jobs in the envlist. :pre-build-script: Shell script to run before tox. Useful for setting up dependencies. (default: a string with a shell comment) :python-version: Python version to invoke pip install of tox-pyenv @@ -402,7 +406,9 @@ variables before running. For example, install prerequisites or move files to the repo root. (default: a string with a shell comment) :parallel: Boolean indicator for tox to run tests in parallel or series. - (default: false, in series) + (default: false, in series) + If true use tox with the options "--parallel auto" and "--parallel-live" + to parallelize jobs in the envlist. :python-version: Python version to invoke pip install of tox-pyenv (default: python2) :stream: Keyword representing a release code-name. @@ -569,7 +575,9 @@ is optional, it defaults to pypi.org. :mvn-params: Parameters to pass to the mvn CLI. (default: '') :mvn-version: Version of maven to use. (default: mvn35) :parallel: Boolean indicator for tox to run tests in parallel or series. - (default: false, in series) + (default: false, in series) + If true use tox with the options "--parallel auto" and "--parallel-live" + to parallelize jobs in the envlist. :pre-build-script: Shell script to execute before the tox builder. For example, install system prerequisites. (default: a shell comment) :pypi-repo: Key for the PyPI target repository in the .pypirc file, @@ -681,7 +689,9 @@ is optional, it defaults to pypi.org. :mvn-params: Parameters to pass to the mvn CLI. (default: '') :mvn-version: Version of maven to use. (default: mvn35) :parallel: Boolean indicator for tox to run tests in parallel or series. - (default: false, in series) + (default: false, in series) + If true use tox with the options "--parallel auto" and "--parallel-live" + to parallelize jobs in the envlist. :pre-build-script: Shell script to execute before the tox builder. For example, install system prerequisites. (default: a shell comment) :pypi-repo: Key for the PyPI target repository in the .pypirc file, @@ -797,7 +807,9 @@ pyenv variables before running. :mvn-params: Parameters to pass to the mvn CLI. (default: '') :mvn-version: Version of maven to use. (default: mvn35) :parallel: Boolean indicator for tox to run tests in parallel or series. - (default: false, in series) + (default: false, in series) + If true use tox with the options "--parallel auto" and "--parallel-live" + to parallelize jobs in the envlist. :pre-build-script: Shell script to execute before the tox builder. For example, install system prerequisites. (default: a shell comment) :python-version: Python version to invoke pip install of tox-pyenv -- 2.16.6