From be428a5b4beb81d35add40534ed9b03e99d918c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dulko?= Date: Wed, 8 Jun 2022 14:47:45 +0200 Subject: [PATCH] Pin setuptools in CNI to 53.0.0-10.el9 Looks like RDO repos upgrade setuptools to version that creates a problem when we attempt to upgrade it through pip. This commit pins RPM setuptools to a version available in baseos repos. This isn't really a great solution, we should probably just start running in a virtualenv, but let's try to unblock the gates with this thing. Change-Id: I0b9e02ef1e9227497082a4a3cd803c52ad2789fb --- cni.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cni.Dockerfile b/cni.Dockerfile index 32729da4f..cff239a31 100644 --- a/cni.Dockerfile +++ b/cni.Dockerfile @@ -13,7 +13,7 @@ ARG OSLO_LOCK_PATH=/var/kuryr-lock ARG RDO_REPO=https://repos.fedorapeople.org/repos/openstack/openstack-yoga/rdo-release-yoga-1.el9s.noarch.rpm RUN dnf upgrade -y && dnf install -y epel-release $RDO_REPO \ - && dnf install -y --setopt=tsflags=nodocs python3-pip openvswitch sudo iproute libstdc++ pciutils kmod-libs \ + && dnf install -y --setopt=tsflags=nodocs python3-pip python3-setuptools-53.0.0-10.el9 openvswitch sudo iproute pciutils kmod-libs \ && dnf install -y --setopt=tsflags=nodocs gcc gcc-c++ python3-devel git COPY . /opt/kuryr-kubernetes