From: Anil Belur <abelur@linuxfoundation.org>
Date: Mon, 29 Jan 2024 23:39:57 +0000 (+1000)
Subject: Fix: Pin JJB to 5.1.0
X-Git-Tag: v0.89.9~1
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=42379db62892d9e5c427995d9793dabab0a46c57;p=releng%2Fglobal-jjb.git

Fix: Pin JJB to 5.1.0

JJB 6.x is released makes it incompatible with 5.x.

Issue: RELENG-5118
Change-Id: I1736c3298421dc847bb8e4600dee43c2cd08ba1b
Ref: https://groups.google.com/g/jenkins-job-builder/c/miYGnWgYZYM
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 20b20114..91262892 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: 5.0.4
+    jjb-version: 5.1.0
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
diff --git a/releasenotes/notes/pin-jjb-5.1.0-0a3cc6b5511c447d.yaml b/releasenotes/notes/pin-jjb-5.1.0-0a3cc6b5511c447d.yaml
new file mode 100644
index 00000000..96c0df70
--- /dev/null
+++ b/releasenotes/notes/pin-jjb-5.1.0-0a3cc6b5511c447d.yaml
@@ -0,0 +1,8 @@
+---
+prelude: >
+  A new version of JJB 6.x is released which breaks backword compatibility.
+fixes:
+  - |
+    Pin global-jjb to 5.1.0 until the codebase is moved to JJB 6x.
+
+    https://groups.google.com/g/jenkins-job-builder/c/miYGnWgYZYM
diff --git a/tox.ini b/tox.ini
index bd167508..a3556450 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,14 +26,14 @@ commands =
 [testenv:jjb]
 basepython = python3
 deps =
-    jenkins-job-builder==5.0.4
+    jenkins-job-builder==5.1.0
 commands =
     jenkins-jobs -l DEBUG test --recursive -o {toxinidir}/archives/job-configs {toxinidir}/jjb:{toxinidir}/.jjb-test
 
 [testenv:jjb-compare-xml]
 basepython = python3
 deps =
-    jenkins-job-builder
+    jenkins-job-builder==5.1.0
 allowlist_externals =
     ./jjb-compare-xml.sh
 commands =
@@ -42,7 +42,7 @@ commands =
 [testenv:jjb-latest]
 basepython = python3
 deps =
-    jenkins-job-builder
+    jenkins-job-builder==5.1.0
 commands =
     jenkins-jobs -l DEBUG test --recursive -o {toxinidir}/archives/job-configs {toxinidir}/jjb:{toxinidir}/.jjb-test
 
@@ -103,7 +103,7 @@ commands =
 
 [testenv:jenkins-jobs]
 deps =
-    jenkins-job-builder{env:JJB_VERSION_OP:~=}{env:JJB_VERSION:5.0.4}
+    jenkins-job-builder{env:JJB_VERSION_OP:~=}{env:JJB_VERSION:5.1.0}
 commands =
     jenkins-jobs {posargs:--help}