From 937dfc122804552b5d942f51ad69c89e5d651d10 Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Wed, 18 May 2022 10:58:24 -0700 Subject: [PATCH] Chore: Upgrade base version of JJB to 4.1.0 JJB has been pinned to v2.8.0 for nearly 2 years. It's time move on, particularly since we've been hard at work dropping support for Python 2.7. This also brings in needed fixes to support recent changes in how many plugins for Jenkins are getting versioned. Change-Id: I1ee78f1b7b5a8fa019cb6fe5a322d02ff8d114e2 Signed-off-by: Andrew Grimberg --- jjb/lf-ci-jobs.yaml | 2 +- releasenotes/notes/jjb_upgrade_4_1_0-412ba074169eabbd.yaml | 11 +++++++++++ tox.ini | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/jjb_upgrade_4_1_0-412ba074169eabbd.yaml diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index bb0baafa..abe3564c 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -101,7 +101,7 @@ disable-job: false github-url: "https://github.com" jjb-cache: "$HOME/.cache/jenkins_jobs" - jjb-version: 2.8.0 + jjb-version: 4.1.0 stream: master submodule-recursive: true submodule-timeout: 10 diff --git a/releasenotes/notes/jjb_upgrade_4_1_0-412ba074169eabbd.yaml b/releasenotes/notes/jjb_upgrade_4_1_0-412ba074169eabbd.yaml new file mode 100644 index 00000000..3413025f --- /dev/null +++ b/releasenotes/notes/jjb_upgrade_4_1_0-412ba074169eabbd.yaml @@ -0,0 +1,11 @@ +--- +upgrade: + - | + Jenkins Job Builder 4.1.0 is now the default version. global-jjb has been + pegged to version 2.8.0 since v0.55.3 released on 2020-07-21. Since this + release JJB has dropped support for Python 2.7 and version 4.1.0 of JJB has + required fixes needed for dealing with versions of plugins that are now + shipping for Jenkins that cause issues. + + Projects that set override their JJB version should either remove the pin + and take what global-jjb defaults to, or reset their pin to 4.1.0 diff --git a/tox.ini b/tox.ini index 50139f22..9f939e30 100644 --- a/tox.ini +++ b/tox.ini @@ -24,7 +24,7 @@ commands = [testenv:jjb] basepython = python3 deps = - jenkins-job-builder==2.8.0 + jenkins-job-builder==4.1.0 commands = jenkins-jobs -l DEBUG test --recursive -o {toxinidir}/archives/job-configs {toxinidir}/jjb:{toxinidir}/.jjb-test @@ -99,7 +99,7 @@ commands = [testenv:jenkins-jobs] deps = - jenkins-job-builder{env:JJB_VERSION_OP:~=}{env:JJB_VERSION:2.8.0} + jenkins-job-builder{env:JJB_VERSION_OP:~=}{env:JJB_VERSION:4.1.0} commands = jenkins-jobs {posargs:--help} -- 2.16.6