From ed8b0461ff68fe952cda75e0337ecfa733f6a99e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 16 May 2023 17:12:27 +0100 Subject: [PATCH] remove Fedora 36, as it reached EOL Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 1 - rpm/Makefile | 2 +- rpm/fedora-36/Dockerfile | 23 ----------------------- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 rpm/fedora-36/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index 3218ddd650..078ee93ba4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,6 @@ def pkgs = [ [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) [target: "debian-bookworm", image: "debian:bookworm", arches: ["amd64", "aarch64", "armhf"]], // Debian 12 (Next stable) - [target: "fedora-36", image: "fedora:36", arches: ["amd64", "aarch64"]], // EOL: May 16, 2023 [target: "fedora-37", image: "fedora:37", arches: ["amd64", "aarch64"]], // EOL: November 14, 2023 [target: "fedora-38", image: "fedora:38", arches: ["amd64", "aarch64"]], // EOL: May 14, 2024 [target: "raspbian-buster", image: "balenalib/rpi-raspbian:buster", arches: ["armhf"]], // Debian/Raspbian 10 (EOL: 2024) diff --git a/rpm/Makefile b/rpm/Makefile index 387171b128..3690697fb8 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -49,7 +49,7 @@ RUN?=docker run --rm \ $(RUN_FLAGS) \ rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) -FEDORA_RELEASES ?= fedora-38 fedora-37 fedora-36 +FEDORA_RELEASES ?= fedora-38 fedora-37 CENTOS_RELEASES ?= centos-7 centos-8 centos-9 ifeq ($(ARCH),s390x) RHEL_RELEASES ?= rhel-7 diff --git a/rpm/fedora-36/Dockerfile b/rpm/fedora-36/Dockerfile deleted file mode 100644 index 2bca75f306..0000000000 --- a/rpm/fedora-36/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -ARG GO_IMAGE -ARG DISTRO=fedora -ARG SUITE=36 -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 -ARG DISTRO -ARG SUITE -ENV DISTRO=${DISTRO} -ENV SUITE=${SUITE} -RUN dnf install -y rpm-build rpmlint dnf-plugins-core -COPY SPECS /root/rpmbuild/SPECS -RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec -COPY --from=golang /usr/local/go /usr/local/go -WORKDIR /root/rpmbuild -ENTRYPOINT ["/bin/rpmbuild"]