From 9af54fac5cd4b82a08281e20cd965357bec77499 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Fri, 10 May 2024 09:06:04 +1000 Subject: [PATCH] Chore: Upgrade Jenkins-job-builder to 6.3.0 JJB 6.3.0 is released includes bug fixes and improvements on job views. Ref: https://groups.google.com/g/jenkins-job-builder/c/d4PPKsGGab0 Issue: RELENG-5285 Change-Id: I0ccd07e80e0394ab9e3a22e7e52794cc5e63cab3 Signed-off-by: Anil Belur --- jenkins-init-scripts/lf-env.sh | 2 +- jjb/lf-ci-jobs.yaml | 2 +- releasenotes/notes/upgrade-jjb-63-5fd6fa81ac03d812.yaml | 8 ++++++++ tox.ini | 6 +++--- 4 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/upgrade-jjb-63-5fd6fa81ac03d812.yaml diff --git a/jenkins-init-scripts/lf-env.sh b/jenkins-init-scripts/lf-env.sh index 7848e53c..a85fae0f 100644 --- a/jenkins-init-scripts/lf-env.sh +++ b/jenkins-init-scripts/lf-env.sh @@ -218,7 +218,7 @@ lf-activate-venv () { for arg in "$@"; do case $arg in jenkins-job-builder) - pkg_list+="jenkins-job-builder==${JJB_VERSION:-6.2.0} " ;; + pkg_list+="jenkins-job-builder==${JJB_VERSION:-6.3.0} " ;; *) pkg_list+="$arg " ;; esac done diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index 83b135dd..eca04296 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: 6.2.0 + jjb-version: 6.3.0 stream: master submodule-recursive: true submodule-timeout: 10 diff --git a/releasenotes/notes/upgrade-jjb-63-5fd6fa81ac03d812.yaml b/releasenotes/notes/upgrade-jjb-63-5fd6fa81ac03d812.yaml new file mode 100644 index 00000000..de42f713 --- /dev/null +++ b/releasenotes/notes/upgrade-jjb-63-5fd6fa81ac03d812.yaml @@ -0,0 +1,8 @@ +upgrade: + - | + Upgrade Jenkins-job-builder to 6.3.0. + + JJB 6.3.0 is released includes bug fixes and improvements on job views. + + Ref: + https://groups.google.com/g/jenkins-job-builder/c/d4PPKsGGab0 diff --git a/tox.ini b/tox.ini index 0e0e9029..3572c141 100644 --- a/tox.ini +++ b/tox.ini @@ -30,7 +30,7 @@ commands = [testenv:jjb] basepython = python3 deps = - jenkins-job-builder==6.2.0 + jenkins-job-builder==6.3.0 # RELENG-5179 (undeclared dependency by stevedore) setuptools commands = @@ -39,7 +39,7 @@ commands = [testenv:jjb-compare-xml] basepython = python3 deps = - jenkins-job-builder==6.2.0 + jenkins-job-builder==6.3.0 allowlist_externals = ./jjb-compare-xml.sh commands = @@ -109,7 +109,7 @@ commands = [testenv:jenkins-jobs] deps = - jenkins-job-builder{env:JJB_VERSION_OP:~=}{env:JJB_VERSION:6.2.0} + jenkins-job-builder{env:JJB_VERSION_OP:~=}{env:JJB_VERSION:6.3.0} commands = jenkins-jobs {posargs:--help} -- 2.16.6