From 155f8ef6df9477cf4d940c53d010561b4c95db00 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 14 Nov 2024 14:34:32 +0100 Subject: [PATCH] remove Fedora 39 (EOL: November 12, 2024) Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 9fb782bc8032984ca6a070e07b30d2fd3a2681c8) Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 1 - rpm/Makefile | 2 +- rpm/fedora-39/Dockerfile | 26 -------------------------- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 rpm/fedora-39/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index a4b7edff81..3847ad5a9b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,6 @@ def pkgs = [ [target: "centos-10", image: "quay.io/centos/centos:stream10", arches: ["amd64", "aarch64"]], // CentOS Stream 10 (EOL: 2030) [target: "debian-bullseye", image: "debian:bullseye", arches: ["amd64", "aarch64", "armhf"]], // Debian 11 (stable) [target: "debian-bookworm", image: "debian:bookworm", arches: ["amd64", "aarch64", "armhf"]], // Debian 12 (Next stable) - [target: "fedora-39", image: "fedora:39", arches: ["amd64", "aarch64"]], // EOL: November 12, 2024 [target: "fedora-40", image: "fedora:40", arches: ["amd64", "aarch64"]], // EOL: May 13, 2025 [target: "fedora-41", image: "fedora:41", arches: ["amd64", "aarch64"]], // EOL: November, 2025 [target: "raspbian-bullseye", image: "balenalib/rpi-raspbian:bullseye", arches: ["armhf"]], // Debian/Raspbian 11 (stable) diff --git a/rpm/Makefile b/rpm/Makefile index 4a45e0cac2..dcd2edae40 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -61,7 +61,7 @@ RUN?=docker run --rm \ $(RUN_FLAGS) \ rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) -FEDORA_RELEASES ?= fedora-39 fedora-40 fedora-41 +FEDORA_RELEASES ?= fedora-40 fedora-41 CENTOS_RELEASES ?= centos-9 centos-10 RHEL_RELEASES ?= rhel-8 rhel-9 diff --git a/rpm/fedora-39/Dockerfile b/rpm/fedora-39/Dockerfile deleted file mode 100644 index 5478277f76..0000000000 --- a/rpm/fedora-39/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -# syntax=docker/dockerfile:1 - -ARG GO_IMAGE=golang:latest -ARG DISTRO=fedora -ARG SUITE=39 -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 GOTOOLCHAIN=local -ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin -ENV AUTO_GOPATH=1 -ARG DISTRO -ARG SUITE -ENV DISTRO=${DISTRO} -ENV SUITE=${SUITE} -RUN dnf install -y rpm-build 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"]