From 45d9a115f755b95b4fc25da7a25ed82bda4efe98 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 13 Jun 2023 17:58:16 +1000 Subject: [PATCH] Fix: Pin urllib3 to <2.0.0 for the JJB cleanup Issue: RELENG-4715 Change-Id: I8d5ef5e30682654b4212a320ffa20f061e11d828 Signed-off-by: Anil Belur --- .../notes/pin-urllib3-jjb-cleanup-3190e0f4c867f3d1.yaml | 17 +++++++++++++++++ shell/jenkins-sandbox-cleanup.sh | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/pin-urllib3-jjb-cleanup-3190e0f4c867f3d1.yaml 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 , but it must be an int, float or None. + + Reference: + + `Launchpad#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 -- 2.16.6