CI: Enabling build for Fedora 44, disabling 32

... to keep latest 12 versions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1d6068478ece55d6a831e8731948aed8c24c54f..f64380f439f88f14f3330f7220f2138308a6b5f5 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,6 @@ spec:
       - opensuse-15.4-amd64
       - opensuse-15.5-amd64
       - opensuse-16.0-amd64
-      - fedora-32-amd64
       - fedora-33-amd64
       - fedora-34-amd64
       - fedora-35-amd64
@@ -64,6 +63,7 @@ spec:
       - fedora-41-amd64
       - fedora-42-amd64
       - fedora-43-amd64
+      - fedora-44-amd64
       - debian-11-amd64
       - debian-11-i386
       - debian-12-amd64
@@ -482,19 +482,6 @@ docker-opensuse-16.0-amd64:
 
   <<: *docker-build
 
-docker-fedora-32-amd64:
-  variables:
-    IMG_NAME: "fedora-32-amd64"
-
-  rules:
-    # Only rebuild if explicitly requested
-  - if: '"$[[ inputs.docker-all ]]" == "true"'
-  - if: '"fedora-32-amd64" =~ /$[[ inputs.docker-regex ]]/'
-  - if: '"fedora-32-amd64" == "$[[ inputs.docker-one ]]"'
-  - when: never
-
-  <<: *docker-build
-
 docker-fedora-33-amd64:
   variables:
     IMG_NAME: "fedora-33-amd64"
@@ -638,6 +625,19 @@ docker-fedora-43-amd64:
 
   <<: *docker-build
 
+docker-fedora-44-amd64:
+  variables:
+    IMG_NAME: "fedora-44-amd64"
+
+  rules:
+    # Only rebuild if explicitly requested
+  - if: '"$[[ inputs.docker-all ]]" == "true"'
+  - if: '"fedora-44-amd64" =~ /$[[ inputs.docker-regex ]]/'
+  - if: '"fedora-44-amd64" == "$[[ inputs.docker-one ]]"'
+  - when: never
+
+  <<: *docker-build
+
 docker-debian-11-amd64:
   variables:
     IMG_NAME: "debian-11-amd64"
@@ -1004,13 +1004,6 @@ build-opensuse-16.0-amd64:
       optional: true
   image: registry.nic.cz/labs/bird:opensuse-16.0-amd64
 
-build-fedora-32-amd64:
-  <<: *build-docker-linux-amd64
-  needs:
-    - job: docker-fedora-32-amd64
-      optional: true
-  image: registry.nic.cz/labs/bird:fedora-32-amd64
-
 build-fedora-33-amd64:
   <<: *build-docker-linux-amd64
   needs:
@@ -1088,6 +1081,13 @@ build-fedora-43-amd64:
       optional: true
   image: registry.nic.cz/labs/bird:fedora-43-amd64
 
+build-fedora-44-amd64:
+  <<: *build-docker-linux-amd64
+  needs:
+    - job: docker-fedora-44-amd64
+      optional: true
+  image: registry.nic.cz/labs/bird:fedora-44-amd64
+
 build-debian-11-amd64:
   <<: *build-docker-linux-amd64
   needs:
@@ -1659,14 +1659,6 @@ pkg-opensuse-16.0-amd64:
     - job: build-release
   image: registry.nic.cz/labs/bird:opensuse-16.0-amd64
 
-pkg-fedora-32-amd64:
-  <<: *pkg-rpm
-  needs:
-    - job: build-fedora-32-amd64
-      artifacts: false
-    - job: build-release
-  image: registry.nic.cz/labs/bird:fedora-32-amd64
-
 pkg-fedora-33-amd64:
   <<: *pkg-rpm
   needs:
@@ -1755,6 +1747,14 @@ pkg-fedora-43-amd64:
     - job: build-release
   image: registry.nic.cz/labs/bird:fedora-43-amd64
 
+pkg-fedora-44-amd64:
+  <<: *pkg-rpm
+  needs:
+    - job: build-fedora-44-amd64
+      artifacts: false
+    - job: build-release
+  image: registry.nic.cz/labs/bird:fedora-44-amd64
+
 pkg-debian-11-amd64:
   <<: *pkg-deb
   needs:
@@ -2355,14 +2355,6 @@ install-opensuse-16.0-amd64:
   variables:
     RPM_INSTALL_CMD: zypper --non-interactive --no-gpg-checks in
 
-install-fedora-32-amd64:
-  <<: *install-rpm
-  needs:
-    - job: pkg-fedora-32-amd64
-  image: registry.nic.cz/labs/bird:fedora-32-amd64
-  variables:
-    RPM_INSTALL_CMD: rpm -i
-
 install-fedora-33-amd64:
   <<: *install-rpm
   needs:
@@ -2451,6 +2443,14 @@ install-fedora-43-amd64:
   variables:
     RPM_INSTALL_CMD: rpm -i
 
+install-fedora-44-amd64:
+  <<: *install-rpm
+  needs:
+    - job: pkg-fedora-44-amd64
+  image: registry.nic.cz/labs/bird:fedora-44-amd64
+  variables:
+    RPM_INSTALL_CMD: rpm -i
+
 install-debian-11-amd64:
   <<: *install-deb
   needs:

diff --git a/gitlab/data.yml.j2 b/gitlab/data.yml.j2
index 166bb8c4836bf4a2ad069da60a301970e288c81c..b532546a0606e25e88e152aecdfb468b8d3fcde2 100644 (file)
--- a/gitlab/data.yml.j2
+++ b/gitlab/data.yml.j2
@@ -86,7 +86,7 @@ distros:
   {% endfor %}
 
   # Last 12 versions of Fedora
-  {% for num in (32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43) -%}
+  {% for num in (33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44) -%}
   - name: fedora-{{ num }}-amd64
     type: rpm
     docker:
@@ -97,9 +97,7 @@ distros:
       {%- if num <= 36 %}
       alternative_lsb: redhat-lsb-core
       {%- endif %}
-      {%- if num > 32 %}
       systemd: true
-      {%- endif %}
 
   {% endfor %}
 

diff --git a/gitlab/docker/fedora-32-amd64/Dockerfile b/gitlab/docker/fedora-44-amd64/Dockerfile
similarity index 83%
rename from gitlab/docker/fedora-32-amd64/Dockerfile
rename to gitlab/docker/fedora-44-amd64/Dockerfile
index 8f4e591f47eac660421301222a6f236d7ff76fdd..190ba6f0cdda175775024d51af470e352c0ae698 100644 (file)
--- a/gitlab/docker/fedora-32-amd64/Dockerfile
+++ b/gitlab/docker/fedora-44-amd64/Dockerfile
@@ -1,9 +1,9 @@
-# Autogenerated Dockerfile for fedora-32-amd64.
+# Autogenerated Dockerfile for fedora-44-amd64.
 # Update data in gitlab/data.yml.j2 and gitlab/Dockerfile.j2
 # to change this file.
 # Request a manual pipeline to rebuild the image here:
 #     https://gitlab.nic.cz/labs/bird/-/pipelines/new
-FROM fedora:32
+FROM fedora:44
 RUN dnf -y upgrade
 RUN dnf -y install \
        gcc \
@@ -17,9 +17,10 @@ RUN dnf -y install \
        readline-devel
 RUN dnf -y install \
        git \
-       redhat-lsb-core \
+       lsb-release \
        rpm-build \
        faketime \
+       systemd \
        systemd-rpm-macros \
        python3 \
        python3-pip \