mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-26 00:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: remove urllib3 downgrade in jjb container, use timeout instead

Browse Source 
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 <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2023-06-28 13:39:41 +02:00 committed by mergify[bot]
parent 3592bbedbb
commit 5e728f51b2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deploy/Dockerfile
View File

@ -1,9 +1,8 @@
FROM quay.io/centos/centos:stream9 FROM quay.io/centos/centos:stream9
# FIXME #3946: jenkins-job-builder does not seem to work with urllib3 2.x
RUN true \ RUN true \
&& dnf -y install git make python3-pip \ && 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 \ && dnf -y clean all \
&& true && true

1
deploy/jjb-config.yaml
View File

@ -11,3 +11,4 @@ data:
user=ndevos-admin-edit-view user=ndevos-admin-edit-view
password=<token-from-user-config-in-webui> password=<token-from-user-config-in-webui>
url=https://jenkins-ceph-csi.apps.ci.centos.org/ url=https://jenkins-ceph-csi.apps.ci.centos.org/
timeout=120