From 5e728f51b2a4cb9a871334c4e760eb97e7d9b3d9 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 28 Jun 2023 13:39:41 +0200 Subject: [PATCH] build: remove urllib3 downgrade in jjb container, use timeout instead The upstream reported issue suggests adding a `timeout` value in the Jenkins Jobs Builder configuration. This looks like a nicer workaround than downgrading urllib3. Fixes: #3946 See-also: https://storyboard.openstack.org/#!/story/2010752 Signed-off-by: Niels de Vos --- deploy/Dockerfile | 3 +-- deploy/jjb-config.yaml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 3b2046304..aec320652 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -1,9 +1,8 @@ FROM quay.io/centos/centos:stream9 -# FIXME #3946: jenkins-job-builder does not seem to work with urllib3 2.x RUN true \ && dnf -y install git make python3-pip \ - && pip3 install jenkins-job-builder 'urllib3>=1.26.15,<2' \ + && pip3 install jenkins-job-builder \ && dnf -y clean all \ && true diff --git a/deploy/jjb-config.yaml b/deploy/jjb-config.yaml index d0bffde1d..e95672aa2 100644 --- a/deploy/jjb-config.yaml +++ b/deploy/jjb-config.yaml @@ -11,3 +11,4 @@ data: user=ndevos-admin-edit-view password= url=https://jenkins-ceph-csi.apps.ci.centos.org/ + timeout=120