summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2018-10-16 17:00:24 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-10-16 17:00:24 +0000
commit76bf771c888957dcecb222b62e36592c84b06021 (patch)
tree1265c9c032c3b6450e6b1937cc46c3b2b2e82b0e
parent6c01646f6856db853cac1fd05866ad5d9dda0651 (diff)
parent2fa1764a193a361fa297862e5c91c911ad4ae959 (diff)
Merge "Update Jenkins Job Builder to 2.5.0"
-rw-r--r--jjb/global/releng-defaults.yaml2
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/jjb/global/releng-defaults.yaml b/jjb/global/releng-defaults.yaml
index 34c5fdde2..d66c007ea 100644
--- a/jjb/global/releng-defaults.yaml
+++ b/jjb/global/releng-defaults.yaml
@@ -16,7 +16,7 @@
build-node: 'opnfv-build'
gerrit-server-name: 'gerrit.opnfv.org'
jenkins-ssh-credential: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
- jjb-version: '2.2.1'
+ jjb-version: '2.5.0'
lftools-version: '<1.0.0'
properties:
diff --git a/tox.ini b/tox.ini
index 976e9a503..0cc9e2333 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ setenv=
[testenv:jjb]
deps =
- jenkins-job-builder==2.2.1
+ jenkins-job-builder==2.5.0
commands=
jenkins-jobs test -o job_output -r {posargs:"jjb/"}