From: Jana Babovakova <babovakova.jana@gmail.com>
Date: Wed, 26 Mar 2025 13:07:50 +0000 (+0100)
Subject: CI: Enabled Fedora 32 - 41.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=648c21e9b0ef443d64e9327ba4efdd95a01fb201;p=thirdparty%2Fbird.git

CI: Enabled Fedora 32 - 41.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5816fef80..d271ca32c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,53 +92,49 @@ build-debian-testing-amd64:
 #  <<: *build-linux
 #  image: registry.nic.cz/labs/bird:debian-testing-i386
 
-build-fedora-25-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-25-amd64
-
-build-fedora-26-amd64:
+build-fedora-32-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-26-amd64
+  image: registry.nic.cz/labs/bird:fedora-32-amd64
 
-build-fedora-27-amd64:
+build-fedora-33-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-27-amd64
+  image: registry.nic.cz/labs/bird:fedora-33-amd64
 
-build-fedora-28-amd64:
+build-fedora-34-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-28-amd64
+  image: registry.nic.cz/labs/bird:fedora-34-amd64
 
-build-fedora-29-amd64:
+build-fedora-35-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-29-amd64
+  image: registry.nic.cz/labs/bird:fedora-35-amd64
 
-build-fedora-30-amd64:
+build-fedora-36-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-30-amd64
+  image: registry.nic.cz/labs/bird:fedora-36-amd64
 
-build-fedora-31-amd64:
+build-fedora-37-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-31-amd64
+  image: registry.nic.cz/labs/bird:fedora-37-amd64
 
-build-fedora-32-amd64:
+build-fedora-38-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-32-amd64
+  image: registry.nic.cz/labs/bird:fedora-38-amd64
 
-build-fedora-33-amd64:
+build-fedora-39-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-33-amd64
+  image: registry.nic.cz/labs/bird:fedora-39-amd64
 
-build-fedora-34-amd64:
+build-fedora-40-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-33-amd64
+  image: registry.nic.cz/labs/bird:fedora-40-amd64
 
 build-fedora-41-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:fedora-41-amd64
 
-build-fedora-42-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-42-amd64
+# build-fedora-42-amd64:
+#   <<: *build-linux
+#   image: registry.nic.cz/labs/bird:fedora-42-amd64
 
 #build-centos-7-amd64:
 #  <<: *build-linux
@@ -313,16 +309,6 @@ pkg-debian-11-amd64:
   needs: [build-debian-11-amd64]
   image: registry.nic.cz/labs/bird:debian-11-amd64
 
-pkg-fedora-30-amd64:
-  <<: *pkg-rpm-wa
-  needs: [build-fedora-30-amd64]
-  image: registry.nic.cz/labs/bird:fedora-30-amd64
-
-pkg-fedora-31-amd64:
-  <<: *pkg-rpm-wa
-  needs: [build-fedora-31-amd64]
-  image: registry.nic.cz/labs/bird:fedora-31-amd64
-
 pkg-fedora-32-amd64:
   <<: *pkg-rpm-wa
   needs: [build-fedora-32-amd64]
@@ -338,15 +324,45 @@ pkg-fedora-34-amd64:
   needs: [build-fedora-34-amd64]
   image: registry.nic.cz/labs/bird:fedora-34-amd64
 
+pkg-fedora-35-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-fedora-35-amd64]
+  image: registry.nic.cz/labs/bird:fedora-35-amd64
+
+pkg-fedora-36-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-fedora-36-amd64]
+  image: registry.nic.cz/labs/bird:fedora-36-amd64
+
+pkg-fedora-37-amd64:
+  <<: *pkg-rpm
+  needs: [build-fedora-37-amd64]
+  image: registry.nic.cz/labs/bird:fedora-37-amd64
+
+pkg-fedora-38-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-fedora-38-amd64]
+  image: registry.nic.cz/labs/bird:fedora-38-amd64
+
+pkg-fedora-39-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-fedora-39-amd64]
+  image: registry.nic.cz/labs/bird:fedora-39-amd64
+
+pkg-fedora-40-amd64:
+  <<: *pkg-rpm
+  needs: [build-fedora-40-amd64]
+  image: registry.nic.cz/labs/bird:fedora-40-amd64
+
 pkg-fedora-41-amd64:
   <<: *pkg-rpm
   needs: [build-fedora-41-amd64]
   image: registry.nic.cz/labs/bird:fedora-41-amd64
 
-pkg-fedora-42-amd64:
-  <<: *pkg-rpm
-  needs: [build-fedora-42-amd64]
-  image: registry.nic.cz/labs/bird:fedora-42-amd64
+# pkg-fedora-42-amd64:
+#   <<: *pkg-rpm
+#   needs: [build-fedora-42-amd64]
+#   image: registry.nic.cz/labs/bird:fedora-42-amd64
 
 #pkg-centos-7-amd64:
 #  <<: *pkg-rpm-wa
diff --git a/misc/docker/fedora-29-amd64/Dockerfile b/misc/docker/fedora-29-amd64/Dockerfile
deleted file mode 100644
index afc1f0c0d..000000000
--- a/misc/docker/fedora-29-amd64/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM fedora:29
-RUN dnf -y upgrade
-RUN dnf -y install \
-	make \
-	autoconf \
-	flex \
-	bison \
-	pkgconfig \
-	'readline-devel' \
-	'pkgconfig(ncurses)' \
-	gcc
diff --git a/misc/docker/fedora-31-amd64/Dockerfile b/misc/docker/fedora-31-amd64/Dockerfile
deleted file mode 100644
index 9f7ad0cd7..000000000
--- a/misc/docker/fedora-31-amd64/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM fedora:31
-RUN dnf -y update
-RUN dnf -y install \
-	gcc \
-	make \
-	flex \
-	bison \
-	autoconf \
-	libssh-devel \
-	ncurses-devel \
-	readline-devel
-RUN dnf -y install \
-	git \
-	rpm-build \
-	systemd-rpm-macros \
-	python3 \
-	python3-pip \
-	python3-setuptools
diff --git a/misc/docker/fedora-25-amd64/Dockerfile b/misc/docker/fedora-35-amd64/Dockerfile
similarity index 90%
rename from misc/docker/fedora-25-amd64/Dockerfile
rename to misc/docker/fedora-35-amd64/Dockerfile
index d0dd8f6f3..5bfa6202f 100644
--- a/misc/docker/fedora-25-amd64/Dockerfile
+++ b/misc/docker/fedora-35-amd64/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:25
+FROM fedora:35
 RUN dnf -y upgrade
 RUN dnf -y install \
 	make \
diff --git a/misc/docker/fedora-26-amd64/Dockerfile b/misc/docker/fedora-36-amd64/Dockerfile
similarity index 90%
rename from misc/docker/fedora-26-amd64/Dockerfile
rename to misc/docker/fedora-36-amd64/Dockerfile
index f15ba40c9..fae222bd3 100644
--- a/misc/docker/fedora-26-amd64/Dockerfile
+++ b/misc/docker/fedora-36-amd64/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:26
+FROM fedora:36
 RUN dnf -y upgrade
 RUN dnf -y install \
 	make \
diff --git a/misc/docker/fedora-27-amd64/Dockerfile b/misc/docker/fedora-37-amd64/Dockerfile
similarity index 90%
rename from misc/docker/fedora-27-amd64/Dockerfile
rename to misc/docker/fedora-37-amd64/Dockerfile
index e31745916..261a5e0f9 100644
--- a/misc/docker/fedora-27-amd64/Dockerfile
+++ b/misc/docker/fedora-37-amd64/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:27
+FROM fedora:37
 RUN dnf -y upgrade
 RUN dnf -y install \
 	make \
diff --git a/misc/docker/fedora-28-amd64/Dockerfile b/misc/docker/fedora-38-amd64/Dockerfile
similarity index 90%
rename from misc/docker/fedora-28-amd64/Dockerfile
rename to misc/docker/fedora-38-amd64/Dockerfile
index 0aa2f74a3..b01777023 100644
--- a/misc/docker/fedora-28-amd64/Dockerfile
+++ b/misc/docker/fedora-38-amd64/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:28
+FROM fedora:38
 RUN dnf -y upgrade
 RUN dnf -y install \
 	make \
diff --git a/misc/docker/fedora-39-amd64/Dockerfile b/misc/docker/fedora-39-amd64/Dockerfile
new file mode 100644
index 000000000..d4e6ea0a4
--- /dev/null
+++ b/misc/docker/fedora-39-amd64/Dockerfile
@@ -0,0 +1,11 @@
+FROM fedora:39
+RUN dnf -y upgrade
+RUN dnf -y install \
+	make \
+	autoconf \
+	flex \
+	bison \
+	pkgconfig \
+	'readline-devel' \
+	'pkgconfig(ncurses)' \
+	gcc
diff --git a/misc/docker/fedora-30-amd64/Dockerfile b/misc/docker/fedora-40-amd64/Dockerfile
similarity index 94%
rename from misc/docker/fedora-30-amd64/Dockerfile
rename to misc/docker/fedora-40-amd64/Dockerfile
index d9aaa62a2..f3f973728 100644
--- a/misc/docker/fedora-30-amd64/Dockerfile
+++ b/misc/docker/fedora-40-amd64/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:30
+FROM fedora:40
 RUN dnf -y update
 RUN dnf -y install \
 	gcc \