From c4c36a2abd0c83b021a20a450e66b8b1fe7be2da Mon Sep 17 00:00:00 2001 From: Matej Matuska Date: Wed, 27 Aug 2025 20:02:46 +0200 Subject: [PATCH 08/55] Remove unused (rh)el7 Containerfiles --- utils/container-builds/Containerfile.centos7 | 15 ----------- utils/container-tests/Containerfile.rhel7 | 24 ------------------ utils/container-tests/Containerfile.ubi7 | 25 ------------------- utils/container-tests/Containerfile.ubi7-lint | 25 ------------------- 4 files changed, 89 deletions(-) delete mode 100644 utils/container-builds/Containerfile.centos7 delete mode 100644 utils/container-tests/Containerfile.rhel7 delete mode 100644 utils/container-tests/Containerfile.ubi7 delete mode 100644 utils/container-tests/Containerfile.ubi7-lint diff --git a/utils/container-builds/Containerfile.centos7 b/utils/container-builds/Containerfile.centos7 deleted file mode 100644 index af00eddb..00000000 --- a/utils/container-builds/Containerfile.centos7 +++ /dev/null @@ -1,15 +0,0 @@ -FROM centos:7 - -VOLUME /repo - -# mirror.centos.org is dead, comment out mirrorlist and set baseurl to vault.centos.org -RUN sed -i s/mirror.centos.org/vault.centos.org/ /etc/yum.repos.d/CentOS-*.repo -RUN sed -i s/^#\s*baseurl=http/baseurl=http/ /etc/yum.repos.d/CentOS-*.repo -RUN sed -i s/^mirrorlist=http/#mirrorlist=http/ /etc/yum.repos.d/CentOS-*.repo - -RUN yum update -y && \ - yum install -y rpm-build python-devel make git - -WORKDIR /repo -ENV DIST_VERSION 7 -ENTRYPOINT make _build_local diff --git a/utils/container-tests/Containerfile.rhel7 b/utils/container-tests/Containerfile.rhel7 deleted file mode 100644 index 0a0c384a..00000000 --- a/utils/container-tests/Containerfile.rhel7 +++ /dev/null @@ -1,24 +0,0 @@ -FROM registry.access.redhat.com/ubi7/ubi:7.9 - -VOLUME /repo - -RUN yum update -y && \ - yum install -y python-virtualenv python-setuptools make git rsync - -# see ./Containerfile.ubi7 for explanation -RUN yum -y install python27-python-pip && \ - scl enable python27 -- pip install -U --target /usr/lib/python2.7/site-packages/ pip==20.3.0 && \ - python -m pip install --ignore-installed pip==20.3.4 ipaddress virtualenv - -ENV PYTHON_VENV python2.7 - -COPY . /repocopy - -WORKDIR /repocopy - -RUN rm -rf tut* - -RUN make clean && make install-deps - -WORKDIR / - diff --git a/utils/container-tests/Containerfile.ubi7 b/utils/container-tests/Containerfile.ubi7 deleted file mode 100644 index 44625a76..00000000 --- a/utils/container-tests/Containerfile.ubi7 +++ /dev/null @@ -1,25 +0,0 @@ -FROM registry.access.redhat.com/ubi7/ubi:7.9 - -VOLUME /payload - -RUN yum update -y && \ - yum install python-virtualenv python-setuptools make git -y - -# NOTE(ivasilev,pstodulk) We need at least pip v10.0.1, however centos:7 -# provides just v8.1.2 (via EPEL). So do this: install epel repos -> install -# python2-pip -> use pip to update to specific pip version we require. period -# NOTE(pstodulk) I see we take care about pip for py3 inside the Makefile, -# however I am afraid of additional possible troubles in future because of the -# archaic pip3 version (v9.0.1). As we want to run tests for Py2 and Py3 in ci -# always anyway, let's put py3 installation here as well.. -# Dropped Python3 as it is now added in its own container on RHEL8 - -# This is some trickery: We install python27-python-pip from the scl, use the scl to bootstrap the python -# module of pip version 20.3.0 and then make it update to 20.3.4 resulting the 'pip' command to be available. -# The --target approach doesn't add it, but at least we now have pip 20.3.4 installed ;-) -RUN yum -y install python27-python-pip && \ - scl enable python27 -- pip install -U --target /usr/lib/python2.7/site-packages/ pip==20.3.0 && \ - python -m pip install --ignore-installed pip==20.3.4 ipaddress virtualenv - -WORKDIR /payload -ENTRYPOINT make install-deps && make test_no_lint diff --git a/utils/container-tests/Containerfile.ubi7-lint b/utils/container-tests/Containerfile.ubi7-lint deleted file mode 100644 index ed548985..00000000 --- a/utils/container-tests/Containerfile.ubi7-lint +++ /dev/null @@ -1,25 +0,0 @@ -FROM registry.access.redhat.com/ubi7/ubi:7.9 - -VOLUME /payload - -RUN yum update -y && \ - yum install python-virtualenv python-setuptools make git -y - -# NOTE(ivasilev,pstodulk) We need at least pip v10.0.1, however centos:7 -# provides just v8.1.2 (via EPEL). So do this: install epel repos -> install -# python2-pip -> use pip to update to specific pip version we require. period -# NOTE(pstodulk) I see we take care about pip for py3 inside the Makefile, -# however I am afraid of additional possible troubles in future because of the -# archaic pip3 version (v9.0.1). As we want to run tests for Py2 and Py3 in ci -# always anyway, let's put py3 installation here as well.. -# Dropped Python3 as it is now added in its own container on RHEL8 - -# This is some trickery: We install python27-python-pip from the scl, use the scl to bootstrap the python -# module of pip version 20.3.0 and then make it update to 20.3.4 resulting the 'pip' command to be available. -# The --target approach doesn't add it, but at least we now have pip 20.3.4 installed ;-) -RUN yum -y install python27-python-pip && \ - scl enable python27 -- pip install -U --target /usr/lib/python2.7/site-packages/ pip==20.3.0 && \ - python -m pip install --ignore-installed pip==20.3.4 ipaddress virtualenv - -WORKDIR /payload -ENTRYPOINT make install-deps && make lint -- 2.51.1