ceph-build-pull-requests: pin jenkins-job-builder to <6.0.0

Something's happened in the new release of jjb that breaks our
yml templates.  There are hints here, perhaps.

https://groups.google.com/g/jenkins-job-builder/c/FQOIorLgi9g

For now, 5.1.0 seems to work.

Also pin it in jenkins-job-builder.

Signed-off-by: Dan Mick <dmick@redhat.com>

diff --git a/ceph-build-pull-requests/build/build b/ceph-build-pull-requests/build/build
index 037a27065b8316d0135c058d4b3d28d3574b6fdc..bc7892bd59a91891afc7e850064320f0e407191a 100644 (file)
--- a/ceph-build-pull-requests/build/build
+++ b/ceph-build-pull-requests/build/build
@@ -3,7 +3,7 @@
 set -e
 
 # the following two methods exist in scripts/build_utils.sh
-pkgs=( "ansible" "ansible-core<=2.15.4" "jenkins-job-builder>=3.5.0" "urllib3==1.26.1" "pyopenssl" "ndg-httpsclient" "pyasn1" )
+pkgs=( "ansible" "ansible-core<=2.15.4" "jenkins-job-builder>=3.5.0,<6.0.0" "urllib3==1.26.1" "pyopenssl" "ndg-httpsclient" "pyasn1" )
 TEMPVENV=$(create_venv_dir)
 VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"

diff --git a/jenkins-job-builder/build/build b/jenkins-job-builder/build/build
index 4c85e535a88aecf836fe6f3d404366edd3c81639..ed12e99db16ac4588e262cd5adb9df0d00d9cd2e 100644 (file)
--- a/jenkins-job-builder/build/build
+++ b/jenkins-job-builder/build/build
@@ -9,7 +9,7 @@
 set -euxo pipefail
 
 # the following two methods exist in scripts/build_utils.sh
-pkgs=( "dataclasses" "jenkins-job-builder>=3.5.0" )
+pkgs=( "dataclasses" "jenkins-job-builder>=3.5.0,<6.0.0" )
 TEMPVENV=$(create_venv_dir)
 VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]" latest