diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-06-12 10:56:33 -0700 |
|---|---|---|
| committer | Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-06-13 13:12:26 -0700 |
| commit | db3fb732c68a96ca6d35f8dfe6d67b601df73325 (patch) | |
| tree | 8c3ec778aa3ca6afe156a414e839eadb9dcf5a62 | |
| parent | eb7e71885b912b5b81b11eeb5b1097310c349b90 (diff) | |
Update tox jjb command to use jjb 2.0.3
2.0.3 is the current JJB version being used by OPNFV.
This removes 'jjb/global' from the positional arguments as overriding
with '-- jjb' will throw errors files are included twice.
Change-Id: If9014fd8a5b92ade89d97994ea1b58f0b227c65a
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
| -rw-r--r-- | docs/infra/jenkins/jjb-usage.rst | 6 | ||||
| -rw-r--r-- | tox.ini | 4 |
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:: @@ -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 |