From: Kefu Chai <tchaikov@gmail.com>
Date: Tue, 9 Aug 2022 00:01:26 +0000 (+0800)
Subject: ceph-build-pull-requests: use a newer urllib3 when installing jjb
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2f9bec9da002ac07b27c5caf5131aeab196509c;p=ceph-build.git

ceph-build-pull-requests: use a newer urllib3 when installing jjb

as urllib3 v1.22 is not compatible with python3.10 which is shipped by
ubuntu jammy. see https://pypi.org/project/urllib3/1.22/

so, to run jjb in a python3.10 venv we should use a newer urllib.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
---

diff --git a/ceph-build-pull-requests/build/build b/ceph-build-pull-requests/build/build
index 204c0a5a..233074c0 100644
--- a/ceph-build-pull-requests/build/build
+++ b/ceph-build-pull-requests/build/build
@@ -5,7 +5,7 @@ set -e
 # the following two methods exist in scripts/build_utils.sh
 # must pin urllib3 to 1.22 because 1.23 is incompatible with requests, which
 # is used by jenkins-job-builder
-pkgs=( "ansible" "jenkins-job-builder>=3.5.0" "urllib3==1.22" "pyopenssl" "ndg-httpsclient" "pyasn1" )
+pkgs=( "ansible" "jenkins-job-builder>=3.5.0" "urllib3==1.26.1" "pyopenssl" "ndg-httpsclient" "pyasn1" )
 TEMPVENV=$(create_venv_dir)
 VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"