From 67c89e9aa09f178771a8a804d31b3212414b5fde Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 5 Jun 2024 00:04:32 +0200 Subject: [PATCH] remove CentOS Stream 8 (EOL: 2024-05-31) CentOS 8 reached EOL and the package repository is no longer live, so removing it. Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 1 - rpm/Makefile | 2 +- rpm/README.md | 2 +- rpm/centos-8/Dockerfile | 38 -------------------------------------- 4 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 rpm/centos-8/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index 94f75c5d65..e28c6df018 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,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-8", image: "quay.io/centos/centos:stream8", arches: ["amd64", "aarch64"]], [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 c44b2a99f2..2f9decfa9e 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -56,7 +56,7 @@ RUN?=docker run --rm \ rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) FEDORA_RELEASES ?= fedora-40 fedora-39 fedora-38 -CENTOS_RELEASES ?= centos-7 centos-8 centos-9 +CENTOS_RELEASES ?= centos-7 centos-9 ifeq ($(ARCH),s390x) RHEL_RELEASES ?= rhel-7 else diff --git a/rpm/README.md b/rpm/README.md index e385c03c76..69e256dc2e 100644 --- a/rpm/README.md +++ b/rpm/README.md @@ -29,7 +29,7 @@ make centos ## Specifying a specific distro version ```shell -make centos-8 +make centos-9 ``` ## Building the for all distros diff --git a/rpm/centos-8/Dockerfile b/rpm/centos-8/Dockerfile deleted file mode 100644 index fd5d30f5e1..0000000000 --- a/rpm/centos-8/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# syntax=docker/dockerfile:1 - -ARG GO_IMAGE -ARG DISTRO=centos -ARG SUITE=8 -ARG BUILD_IMAGE=quay.io/centos/${DISTRO}:stream${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-Stream-Sources.repo ]; then sed -i 's/altarch/centos/g' /etc/yum.repos.d/CentOS-Stream-Sources.repo; fi - -RUN if [ -f /etc/yum.repos.d/CentOS-Stream-PowerTools.repo ]; then sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/CentOS-Stream-PowerTools.repo; fi - -# RHEL8 / CentOS 8 changed behavior and no longer "rpm --import" or -# "rpmkeys --import"as part of rpm package's %post scriplet. See -# https://forums.centos.org/viewtopic.php?f=54&t=72574, and -# https://access.redhat.com/solutions/3720351 -RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial -RUN dnf install -y rpm-build rpmlint dnf-plugins-core -COPY --link SPECS /root/rpmbuild/SPECS -RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec -COPY --link --from=golang /usr/local/go /usr/local/go -WORKDIR /root/rpmbuild -ENTRYPOINT ["/bin/rpmbuild"]