From: Anil Belur <abelur@linuxfoundation.org>
Date: Tue, 13 Jun 2023 07:58:16 +0000 (+1000)
Subject: Fix: Pin urllib3 to <2.0.0 for the JJB cleanup
X-Git-Tag: v0.86.9^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?p=releng%2Fglobal-jjb.git;a=commitdiff_plain;h=45d9a115f755b95b4fc25da7a25ed82bda4efe98

Fix: Pin urllib3 to <2.0.0 for the JJB cleanup

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

diff --git a/releasenotes/notes/pin-urllib3-jjb-cleanup-3190e0f4c867f3d1.yaml b/releasenotes/notes/pin-urllib3-jjb-cleanup-3190e0f4c867f3d1.yaml
new file mode 100644
index 00000000..010270bc
--- /dev/null
+++ b/releasenotes/notes/pin-urllib3-jjb-cleanup-3190e0f4c867f3d1.yaml
@@ -0,0 +1,17 @@
+---
+fixes:
+  - |
+    Pin urllib3 to <2.0.0 for the JJB cleanup
+
+    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/jenkins-sandbox-cleanup.sh b/shell/jenkins-sandbox-cleanup.sh
index 1dd520a8..51970248 100644
--- a/shell/jenkins-sandbox-cleanup.sh
+++ b/shell/jenkins-sandbox-cleanup.sh
@@ -16,7 +16,8 @@ set -euf -o pipefail
 # shellcheck disable=SC1090
 . ~/lf-env.sh
 
-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 urllib3~=1.26.15
 
 # jenkins-jobs does not always open 'stdin' which may cause 'yes' to fail
 (yes || true) | jenkins-jobs -s sandbox delete-all