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 <[email protected]>
opnfv · Jun 13, 2018 · db3fb73 · db3fb73
1 parent eb7e718
commit db3fb73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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://[email protected]:29418/releng
+    git clone --recursive ssh://[email protected]: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
@@ -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