From: Anil Belur <abelur@linuxfoundation.org>
Date: Wed, 1 May 2024 02:59:37 +0000 (+1000)
Subject: Chore: Upgrade Jenkins-job-builder to 6.2.0
X-Git-Tag: v0.90.5~4
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=4a453bea3ef89142282673781ec0b038d4d58b27;p=releng%2Fglobal-jjb.git

Chore: Upgrade Jenkins-job-builder to 6.2.0

JJB 6.2.0 is released includes bug fixes and improvements on job views.

Ref:
https://groups.google.com/g/jenkins-job-builder/c/CXXF5U-05BI/m/cRu0nU-BAgAJ

Issue: RELENG-5285
Change-Id: Id58222e29c587fb787b778c00816f455b65bff3a
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/jenkins-init-scripts/lf-env.sh b/jenkins-init-scripts/lf-env.sh
index 36a0261a..7848e53c 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.0.0} " ;;
+                    pkg_list+="jenkins-job-builder==${JJB_VERSION:-6.2.0} " ;;
                 *)                   pkg_list+="$arg " ;;
             esac
         done
diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index c15af0a8..83b135dd 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.0.0
+    jjb-version: 6.2.0
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
diff --git a/releasenotes/notes/upgrade-jjb-62-2f804efff34ac79b.yaml b/releasenotes/notes/upgrade-jjb-62-2f804efff34ac79b.yaml
new file mode 100644
index 00000000..9f1ec99b
--- /dev/null
+++ b/releasenotes/notes/upgrade-jjb-62-2f804efff34ac79b.yaml
@@ -0,0 +1,8 @@
+upgrade:
+  - |
+    Upgrade Jenkins-job-builder to 6.2.0.
+
+    JJB 6.2.0 is released includes bug fixes and improvements on job views.
+
+    Ref:
+    https://groups.google.com/g/jenkins-job-builder/c/CXXF5U-05BI/m/cRu0nU-BAgAJ
diff --git a/tox.ini b/tox.ini
index d9ebf87f..0e0e9029 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,7 +30,7 @@ commands =
 [testenv:jjb]
 basepython = python3
 deps =
-    jenkins-job-builder==6.0.0
+    jenkins-job-builder==6.2.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.0.0
+    jenkins-job-builder==6.2.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.0.0}
+    jenkins-job-builder{env:JJB_VERSION_OP:~=}{env:JJB_VERSION:6.2.0}
 commands =
     jenkins-jobs {posargs:--help}