summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2018-06-18 14:23:07 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-06-18 14:23:07 +0000
commit1f2eb7ab017494dd681917d854e5689fb49e4e38 (patch)
tree144b60cb2dc595bc85b476c7792d695360330285
parente6817b9d64bd972c791727e40687a313ce3321c9 (diff)
parentdb3fb732c68a96ca6d35f8dfe6d67b601df73325 (diff)
Merge "Update tox jjb command to use jjb 2.0.3"
-rw-r--r--docs/infra/jenkins/jjb-usage.rst6
-rw-r--r--tox.ini4
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/infra/jenkins/jjb-usage.rst b/docs/infra/jenkins/jjb-usage.rst
index 671278121..d467dbe8a 100644
--- a/docs/infra/jenkins/jjb-usage.rst
+++ b/docs/infra/jenkins/jjb-usage.rst
@@ -10,7 +10,7 @@ Creating/Configuring/Verifying Jenkins Jobs
Clone and setup the repo::
- git clone ssh://YOU@gerrit.opnfv.org:29418/releng
+ git clone --recursive ssh://YOU@gerrit.opnfv.org:29418/releng
cd releng
git review -s
@@ -29,13 +29,13 @@ Make changes::
Test with tox::
- tox -v -ejjb
+ tox -e jjb
.. note:: You can also test the jobs under a single jjb directory by
specifying the directory. For example to test only the releng jobs, you
could run:
- tox -v -e jjb -- jjb/releng
+ tox -e jjb -- jjb/global:jjb/global-jjb:jjb/releng
Submit the change to gerrit::
diff --git a/tox.ini b/tox.ini
index abdffc52d..d2f416884 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,9 +15,9 @@ setenv=
[testenv:jjb]
deps =
- jenkins-job-builder==1.6.1
+ jenkins-job-builder==2.0.3
commands=
- jenkins-jobs test -o job_output -r jjb/global:{posargs:"jjb/"}
+ jenkins-jobs test -o job_output -r {posargs:"jjb/"}
[testenv:docs]
deps = -r{toxinidir}/docs/requirements.txt