From: Anil Belur <abelur@linuxfoundation.org>
Date: Wed, 10 May 2023 01:15:38 +0000 (+1000)
Subject: Fix: pin urllib3 to <2.0.0 for verify jobs
X-Git-Tag: v0.86.3^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F20%2F71720%2F1;p=releng%2Fglobal-jjb.git

Fix: pin urllib3 to <2.0.0 for verify jobs

The latest version of module breaks compatibility
with python-jenkins.

Note: The pip upgrade eager option pulls in the newer
version of urllib3>2.0.0 unless the exact version is passed
with lftools.

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

diff --git a/releasenotes/notes/pin-urllib3-jjb-verify-1064b274e3e4ed60.yaml b/releasenotes/notes/pin-urllib3-jjb-verify-1064b274e3e4ed60.yaml
new file mode 100644
index 00000000..b8fe6274
--- /dev/null
+++ b/releasenotes/notes/pin-urllib3-jjb-verify-1064b274e3e4ed60.yaml
@@ -0,0 +1,17 @@
+---
+fixes:
+  - |
+    Pin urllib3 to <2.0.0 for the verify jobs
+
+    The latest version of module breaks compatibility with python-jenkins.
+
+    Error:
+
+    .. code-block:: bash
+
+       ValueError: Timeout value connect was <object object at
+       0x7fe57a4948a0>, but it must be an int, float or None.
+
+    Reference:
+
+       `Launchpad#2018567 <https://bugs.launchpad.net/python-jenkins/+bug/2018567>`
diff --git a/shell/jjb-verify-job.sh b/shell/jjb-verify-job.sh
index fc63884d..0424f743 100644
--- a/shell/jjb-verify-job.sh
+++ b/shell/jjb-verify-job.sh
@@ -18,7 +18,8 @@ source ~/lf-env.sh
 lf-git-validate-jira-urls
 lf-jjb-check-ascii
 
-lf-activate-venv --python python3 --venv-file /tmp/.jjb_venv jenkins-job-builder
+lf-activate-venv --python python3 --venv-file /tmp/.jjb_venv \
+    jenkins-job-builder setuptools==65.7.0 urllib3~=1.26.15
 
 jenkins-jobs test --recursive -o archives/job-configs --config-xml jjb/
 
diff --git a/shell/job-cost.sh b/shell/job-cost.sh
index 85096cdd..6a989a65 100644
--- a/shell/job-cost.sh
+++ b/shell/job-cost.sh
@@ -29,7 +29,7 @@ if [[ $cloudtype == "DataSourceEc2Local" ]]; then
     exit 0
 fi
 
-lf-activate-venv zipp==1.1.0 python-openstackclient
+lf-activate-venv zipp==1.1.0 python-openstackclient urllib3~=1.26.15
 
 if [[ -z ${JOB_NAME:-} ]]; then
     lf-echo-error "Required Env Variable Unset/Empty: JOB_NAME"