From 88a6cdca6c22c13641b6b288f095e1b868b6c05d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 18 Jun 2024 18:14:39 +0200 Subject: [PATCH] remove CentOS 7 (EOL 2024-06-30) CentOS 7 [reaches EOL on June 30][1], so we won't be building packages for v27.0 [1]: https://blog.centos.org/2023/04/end-dates-are-coming-for-centos-stream-8-and-centos-linux-7/#centos-linux-7-end-of-life-june-30-2024 Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 1 - rpm/Makefile | 6 +----- rpm/centos-7/Dockerfile | 31 ------------------------------- rpm/rhel-7/Dockerfile | 30 ------------------------------ 4 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 rpm/centos-7/Dockerfile delete mode 100644 rpm/rhel-7/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index e044ee4262..e14e21e51b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,6 @@ def branch = env.CHANGE_TARGET ?: env.BRANCH_NAME def pkgs = [ - [target: "centos-7", image: "centos:7", arches: ["amd64", "aarch64"]], // (EOL: June 30, 2024) [target: "centos-9", image: "quay.io/centos/centos:stream9", arches: ["amd64", "aarch64"]], [target: "debian-buster", image: "debian:buster", arches: ["amd64", "aarch64", "armhf"]], // Debian 10 (EOL: 2024) [target: "debian-bullseye", image: "debian:bullseye", arches: ["amd64", "aarch64", "armhf"]], // Debian 11 (stable) diff --git a/rpm/Makefile b/rpm/Makefile index 924bffdfbb..caa3cbdf93 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -56,12 +56,8 @@ RUN?=docker run --rm \ rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) FEDORA_RELEASES ?= fedora-40 fedora-39 -CENTOS_RELEASES ?= centos-7 centos-9 -ifeq ($(ARCH),s390x) -RHEL_RELEASES ?= rhel-7 -else +CENTOS_RELEASES ?= centos-9 RHEL_RELEASES ?= -endif DISTROS := $(FEDORA_RELEASES) $(CENTOS_RELEASES) $(RHEL_RELEASES) BUNDLES := $(patsubst %,rpmbuild/bundles-ce-%-$(DPKG_ARCH).tar.gz,$(DISTROS)) diff --git a/rpm/centos-7/Dockerfile b/rpm/centos-7/Dockerfile deleted file mode 100644 index f49c4c62d8..0000000000 --- a/rpm/centos-7/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -# syntax=docker/dockerfile:1 - -ARG GO_IMAGE -ARG DISTRO=centos -ARG SUITE=7 -ARG BUILD_IMAGE=${DISTRO}:${SUITE} - -FROM ${GO_IMAGE} AS golang - -FROM ${BUILD_IMAGE} - -ENV GOPROXY=https://proxy.golang.org|direct -ENV GO111MODULE=off -ENV GOPATH=/go -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin -ENV AUTO_GOPATH 1 -ENV DOCKER_BUILDTAGS exclude_graphdriver_btrfs -ARG DISTRO -ARG SUITE -ENV DISTRO=${DISTRO} -ENV SUITE=${SUITE} - -# In aarch64 (arm64) images, the altarch repo is specified as repository, but -# failing, so replace the URL. -RUN if [ -f /etc/yum.repos.d/CentOS-Sources.repo ]; then sed -i 's/altarch/centos/g' /etc/yum.repos.d/CentOS-Sources.repo; fi -RUN yum install -y rpm-build rpmlint -COPY --link SPECS /root/rpmbuild/SPECS -RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec -COPY --link --from=golang /usr/local/go /usr/local/go -WORKDIR /root/rpmbuild -ENTRYPOINT ["/bin/rpmbuild"] diff --git a/rpm/rhel-7/Dockerfile b/rpm/rhel-7/Dockerfile deleted file mode 100644 index 104b7cae73..0000000000 --- a/rpm/rhel-7/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -# syntax=docker/dockerfile:1 - -ARG GO_IMAGE -ARG DISTRO=rhel -ARG SUITE=7 -ARG BUILD_IMAGE=dockereng/${DISTRO}:${SUITE}-s390x - -FROM ${GO_IMAGE} AS golang - -FROM ${BUILD_IMAGE} -ENV GOPROXY=https://proxy.golang.org|direct -ENV GO111MODULE=off -ENV GOPATH=/go -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin -ENV AUTO_GOPATH 1 -ARG DISTRO -ARG SUITE -ENV DISTRO=${DISTRO} -ENV SUITE=${SUITE} -ENV CC=gcc - -# In aarch64 (arm64) images, the altarch repo is specified as repository, but -# failing, so replace the URL. -RUN if [ -f /etc/yum.repos.d/CentOS-Sources.repo ]; then sed -i 's/altarch/centos/g' /etc/yum.repos.d/CentOS-Sources.repo; fi -RUN yum install -y rpm-build rpmlint -COPY --link SPECS /root/rpmbuild/SPECS -RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec -COPY --link --from=golang /usr/local/go /usr/local/go -WORKDIR /root/rpmbuild -ENTRYPOINT ["/bin/rpmbuild"]