Merge 1/2: all yaml changes from jb_distr_list2.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac3ede0477f8ad3296c0f5c1be68fbf3430a4a15..29b65d101e518d37e9f2ad7b54be7e0a2ce731df 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,7 @@ stages:
 
 .docker: &docker_build
   stage: image
+  allow_failure: true
   script:
   - $DOCKER_CMD login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.nic.cz
   # Make sure we refresh the base image if it updates (eg. security updates, etc)
@@ -47,14 +48,14 @@ docker-docbuilder:
     IMG_NAME: "docbuilder"
   <<: *docker_build
 
-docker-debian-9-amd64:
+docker-centos-7-amd64:
   variables:
-    IMG_NAME: "debian-9-amd64"
+    IMG_NAME: "centos-7-amd64"
   <<: *docker_build
 
-docker-debian-9-i386:
+docker-centos-8-amd64:
   variables:
-    IMG_NAME: "debian-9-i386"
+    IMG_NAME: "centos-8-amd64"
   <<: *docker_build
 
 docker-debian-10-amd64:
@@ -147,14 +148,40 @@ docker-fedora-41-amd64:
     IMG_NAME: "fedora-41-amd64"
   <<: *docker_build
 
-docker-centos-7-amd64:
+#planned release 4/2025
+# docker-fedora-41-amd64:
+#   variables:
+#     IMG_NAME: "fedora-41-amd64"
+#   <<: *docker_build
+
+docker-opensuse-15.0-amd64:
   variables:
-    IMG_NAME: "centos-7-amd64"
+    IMG_NAME: "opensuse-15.0-amd64"
   <<: *docker_build
 
-docker-centos-8-amd64:
+docker-opensuse-15.1-amd64:
   variables:
-    IMG_NAME: "centos-8-amd64"
+    IMG_NAME: "opensuse-15.1-amd64"
+  <<: *docker_build
+
+docker-opensuse-15.2-amd64:
+  variables:
+    IMG_NAME: "opensuse-15.2-amd64"
+  <<: *docker_build
+
+docker-opensuse-15.3-amd64:
+  variables:
+    IMG_NAME: "opensuse-15.3-amd64"
+  <<: *docker_build
+
+docker-opensuse-15.4-amd64:
+  variables:
+    IMG_NAME: "opensuse-15.4-amd64"
+  <<: *docker_build
+
+docker-opensuse-15.5-amd64:
+  variables:
+    IMG_NAME: "opensuse-15.5-amd64"
   <<: *docker_build
 
 docker-ubuntu-16_04-amd64:
@@ -172,41 +199,50 @@ docker-ubuntu-20_04-amd64:
     IMG_NAME: "ubuntu-20.04-amd64"
   <<: *docker_build
 
-docker-ubuntu-22_04-amd64:
+docker-ubuntu-20_10-amd64:
   variables:
-    IMG_NAME: "ubuntu-22.04-amd64"
+    IMG_NAME: "ubuntu-20.10-amd64"
   <<: *docker_build
 
-docker-ubuntu-24_04-amd64:
+docker-ubuntu-21_04-amd64:
   variables:
-    IMG_NAME: "ubuntu-24.04-amd64"
+    IMG_NAME: "ubuntu-21.04-amd64"
   <<: *docker_build
 
-docker-ubuntu-24_10-amd64:
+docker-ubuntu-21_10-amd64:
   variables:
-    IMG_NAME: "ubuntu-24.10-amd64"
+    IMG_NAME: "ubuntu-21.10-amd64"
   <<: *docker_build
 
-docker-opensuse-15.0-amd64:
+docker-ubuntu-22_04-amd64:
   variables:
-    IMG_NAME: "opensuse-15.0-amd64"
+    IMG_NAME: "ubuntu-22.04-amd64"
   <<: *docker_build
 
-docker-opensuse-15.1-amd64:
+docker-ubuntu-22_10-amd64:
   variables:
-    IMG_NAME: "opensuse-15.1-amd64"
+    IMG_NAME: "ubuntu-22.10-amd64"
   <<: *docker_build
 
-docker-opensuse-15.2-amd64:
+docker-ubuntu-23_04-amd64:
   variables:
-    IMG_NAME: "opensuse-15.2-amd64"
+    IMG_NAME: "ubuntu-23.04-amd64"
   <<: *docker_build
 
-docker-opensuse-15.3-amd64:
+docker-ubuntu-23_10-amd64:
   variables:
-    IMG_NAME: "opensuse-15.3-amd64"
+    IMG_NAME: "ubuntu-23.10-amd64"
   <<: *docker_build
 
+docker-ubuntu-24_04-amd64:
+  variables:
+    IMG_NAME: "ubuntu-24.04-amd64"
+  <<: *docker_build
+
+docker-ubuntu-24_10-amd64:
+  variables:
+    IMG_NAME: "ubuntu-24.10-amd64"
+  <<: *docker_build
 
 .build: &build-base
   stage: build
@@ -245,6 +281,18 @@ build-release:
     - linux
     - amd64
 
+build-centos-7-amd64:
+  <<: *build-linux
+  variables:
+    # export path to devtoolset-8-gcc
+    CC: /opt/rh/devtoolset-8/root/usr/bin/gcc
+    LC_ALL: en_US.UTF-8
+  image: registry.nic.cz/labs/bird:centos-7-amd64
+
+build-centos-8-amd64:
+  <<: *build-linux
+  image: registry.nic.cz/labs/bird:centos-8-amd64
+
 build-debian-10-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:debian-10-amd64
@@ -269,13 +317,13 @@ build-debian-12-i386:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:debian-12-i386
 
-build-debian-testing-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:debian-testing-amd64
+# build-debian-testing-amd64:
+#   <<: *build-linux
+#   image: registry.nic.cz/labs/bird:debian-testing-amd64
 
-build-debian-testing-i386:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:debian-testing-i386
+# build-debian-testing-i386:
+#   <<: *build-linux
+#   image: registry.nic.cz/labs/bird:debian-testing-i386
 
 build-fedora-32-amd64:
   <<: *build-linux
@@ -317,50 +365,34 @@ build-fedora-41-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:fedora-41-amd64
 
-#installation not available yet
+#planned release 4/2025
 # build-fedora-42-amd64:
 #   <<: *build-linux
 #   image: registry.nic.cz/labs/bird:fedora-42-amd64
 
-build-fedora-35-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-35-amd64
-
-build-fedora-36-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-36-amd64
-
-build-fedora-37-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-37-amd64
-
-build-fedora-38-amd64:
+build-opensuse-15.0-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-38-amd64
+  image: registry.nic.cz/labs/bird:opensuse-15.0-amd64
 
-build-fedora-39-amd64:
+build-opensuse-15.1-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-39-amd64
+  image: registry.nic.cz/labs/bird:opensuse-15.1-amd64
 
-build-fedora-40-amd64:
+build-opensuse-15.2-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-40-amd64
+  image: registry.nic.cz/labs/bird:opensuse-15.2-amd64
 
-build-fedora-41-amd64:
+build-opensuse-15.3-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-41-amd64
+  image: registry.nic.cz/labs/bird:opensuse-15.3-amd64
 
-build-centos-7-amd64:
-  <<: *build-linux
-  variables:
-    # export path to devtoolset-8-gcc
-    CC: /opt/rh/devtoolset-8/root/usr/bin/gcc
-    LC_ALL: en_US.UTF-8
-  image: registry.nic.cz/labs/bird:centos-7-amd64
+# build-opensuse-15.4-amd64:
+#   <<: *build-linux
+#   image: registry.nic.cz/labs/bird:opensuse-15.4-amd64
 
-build-centos-8-amd64:
+build-opensuse-15.5-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:centos-8-amd64
+  image: registry.nic.cz/labs/bird:opensuse-15.5-amd64
 
 build-ubuntu-16_04-amd64:
   <<: *build-linux
@@ -378,30 +410,26 @@ build-ubuntu-20_10-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:ubuntu-20.10-amd64 
 
-#installation not available
 # build-ubuntu-21_04-amd64:
 #   <<: *build-linux
 #   image: registry.nic.cz/labs/bird:ubuntu-21.04-amd64
 
 build-ubuntu-21_10-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:ubuntu-22.04-amd64
+  image: registry.nic.cz/labs/bird:ubuntu-21.10-amd64
 
 build-ubuntu-22_04-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:ubuntu-22.04-amd64
 
-#installation not available
 # build-ubuntu-22_10-amd64:
 #   <<: *build-linux
 #   image: registry.nic.cz/labs/bird:ubuntu-22.10-amd64
 
-#installation not available
 # build-ubuntu-23_04-amd64:
 #   <<: *build-linux
 #   image: registry.nic.cz/labs/bird:ubuntu-23.04-amd64
 
-#installation not available
 # build-ubuntu-23_10-amd64:
 #   <<: *build-linux
 #   image: registry.nic.cz/labs/bird:ubuntu-23.10-amd64
@@ -414,32 +442,6 @@ build-ubuntu-24_10-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:ubuntu-24.10-amd64
 
-build-opensuse-15.0-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:opensuse-15.0-amd64
-
-build-opensuse-15.1-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:opensuse-15.1-amd64
-
-build-opensuse-15.2-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:opensuse-15.2-amd64
-
-build-opensuse-15.3-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:opensuse-15.3-amd64
-
-#installation not available
-# build-opensuse-15.4-amd64:
-#   <<: *build-linux
-#   image: registry.nic.cz/labs/bird:opensuse-15.4-amd64
-
-#installation not available
-# build-opensuse-15.5-amd64:
-#   <<: *build-linux
-#   image: registry.nic.cz/labs/bird:opensuse-15.5-amd64
-
 #build-freebsd-11-amd64:
 #  <<: *build-base
 #  tags:
@@ -572,6 +574,20 @@ build-only-static:
     paths:
       - pkg/pkgs/*
 
+pkg-centos-7-amd64:
+  <<: *pkg-rpm-wa
+  variables:
+    # export path to devtoolset-8-gcc
+    CC: /opt/rh/devtoolset-8/root/usr/bin/gcc
+    LC_ALL: en_US.UTF-8
+  needs: [build-centos-7-amd64]
+  image: registry.nic.cz/labs/bird:centos-7-amd64
+
+pkg-centos-8-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-centos-8-amd64]
+  image: registry.nic.cz/labs/bird:centos-8-amd64
+
 pkg-debian-10-amd64:
   <<: *pkg-deb
   needs: [build-debian-10-amd64]
@@ -592,25 +608,21 @@ pkg-debian-11-i386:
   needs: [build-debian-11-i386]
   image: registry.nic.cz/labs/bird:debian-11-i386
 
-# Removed due to apkg breakage
-# pkg-debian-12-amd64:
-#   <<: *pkg-deb
-#   needs: [build-debian-12-amd64]
-#   image: registry.nic.cz/labs/bird:debian-12-amd64
+pkg-debian-12-amd64:
+  <<: *pkg-deb
+  needs: [build-debian-12-amd64]
+  image: registry.nic.cz/labs/bird:debian-12-amd64
 
-# Removed due to apkg breakage
-# pkg-debian-12-i386:
-#   <<: *pkg-deb
-#   needs: [build-debian-12-i386]
-#   image: registry.nic.cz/labs/bird:debian-12-i386
+pkg-debian-12-i386:
+  <<: *pkg-deb
+  needs: [build-debian-12-i386]
+  image: registry.nic.cz/labs/bird:debian-12-i386
 
-# Removed due to apkg breakage
 # pkg-debian-testing-amd64:
 #   <<: *pkg-deb
 #   needs: [build-debian-testing-amd64]
 #   image: registry.nic.cz/labs/bird:debian-testing-amd64
 
-# Removed due to apkg breakage
 # pkg-debian-testing-i386:
 #   <<: *pkg-deb
 #   needs: [build-debian-testing-i386]
@@ -633,13 +645,11 @@ pkg-fedora-34-amd64:
 
 pkg-fedora-35-amd64:
   <<: *pkg-rpm
-  #<<: *pkg-rpm-wa
   needs: [build-fedora-35-amd64]
   image: registry.nic.cz/labs/bird:fedora-35-amd64
 
 pkg-fedora-36-amd64:
   <<: *pkg-rpm
-  #<<: *pkg-rpm-wa
   needs: [build-fedora-36-amd64]
   image: registry.nic.cz/labs/bird:fedora-36-amd64
 
@@ -650,13 +660,11 @@ pkg-fedora-37-amd64:
 
 pkg-fedora-38-amd64:
   <<: *pkg-rpm
-  #<<: *pkg-rpm-wa
   needs: [build-fedora-38-amd64]
   image: registry.nic.cz/labs/bird:fedora-38-amd64
 
 pkg-fedora-39-amd64:
   <<: *pkg-rpm
-  #<<: *pkg-rpm-wa
   needs: [build-fedora-39-amd64]
   image: registry.nic.cz/labs/bird:fedora-39-amd64
 
@@ -670,35 +678,48 @@ pkg-fedora-41-amd64:
   needs: [build-fedora-41-amd64]
   image: registry.nic.cz/labs/bird:fedora-41-amd64
 
-#installation not available yet
+#planned release 4/2025
 # 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-opensuse-15.0-amd64:
+ <<: *pkg-rpm-wa
+ needs: [build-opensuse-15.0-amd64]
+ image: registry.nic.cz/labs/bird:opensuse-15.0-amd64
+
+pkg-opensuse-15.1-amd64:
+ <<: *pkg-rpm-wa
+ needs: [build-opensuse-15.1-amd64]
+ image: registry.nic.cz/labs/bird:opensuse-15.1-amd64
+
+pkg-opensuse-15.2-amd64:
+ <<: *pkg-rpm-wa
+ needs: [build-opensuse-15.2-amd64]
+ image: registry.nic.cz/labs/bird:opensuse-15.2-amd64
+
+pkg-opensuse-15.3-amd64:
   <<: *pkg-rpm-wa
-  variables:
-    # export path to devtoolset-8-gcc
-    CC: /opt/rh/devtoolset-8/root/usr/bin/gcc
-    LC_ALL: en_US.UTF-8
-  needs: [build-centos-7-amd64]
-  image: registry.nic.cz/labs/bird:centos-7-amd64
+  needs: [build-opensuse-15.3-amd64]
+  image: registry.nic.cz/labs/bird:opensuse-15.3-amd64
+
+# pkg-opensuse-15.4-amd64:
+#   <<: *pkg-rpm-wa
+#   needs: [build-opensuse-15.4-amd64]
+#   image: registry.nic.cz/labs/bird:opensuse-15.4-amd64
 
-# Removed due to apkg breakage
-#pkg-centos-8-amd64:
-#  <<: *pkg-rpm-wa
-#  needs: [build-centos-8-amd64]
-#  image: registry.nic.cz/labs/bird:centos-8-amd64
+pkg-opensuse-15.5-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-opensuse-15.5-amd64]
+  image: registry.nic.cz/labs/bird:opensuse-15.5-amd64
 
-# Removed due to apkg breakage
 # pkg-ubuntu-16.04-amd64:
 #   <<: *pkg-deb
 #   needs: [build-ubuntu-16_04-amd64]
 #   image: registry.nic.cz/labs/bird:ubuntu-16.04-amd64
 
-# Removed due to apkg breakage
-#pkg-ubuntu-18.04-amd64:
+# pkg-ubuntu-18.04-amd64:
 #  <<: *pkg-deb
 #  needs: [build-ubuntu-18_04-amd64]
 #  image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
@@ -713,7 +734,6 @@ pkg-ubuntu-20.10-amd64:
   needs: [build-ubuntu-20_10-amd64]
   image: registry.nic.cz/labs/bird:ubuntu-20.10-amd64
 
-#Installation not available
 # pkg-ubuntu-21.04-amd64:
 #   <<: *pkg-deb
 #   needs: [build-ubuntu-21_04-amd64]
@@ -721,72 +741,38 @@ pkg-ubuntu-20.10-amd64:
 
 pkg-ubuntu-21.10-amd64:
   <<: *pkg-deb
-  needs: [build-ubuntu-22_04-amd64]
-  image: registry.nic.cz/labs/bird:ubuntu-22.04-amd64
+  needs: [build-ubuntu-21_10-amd64]
+  image: registry.nic.cz/labs/bird:ubuntu-21.10-amd64
 
 pkg-ubuntu-22.04-amd64:
   <<: *pkg-deb
   needs: [build-ubuntu-22_04-amd64]
   image: registry.nic.cz/labs/bird:ubuntu-22.04-amd64
 
-#Installation not available
 # pkg-ubuntu-22.10-amd64:
 #   <<: *pkg-deb
 #   needs: [build-ubuntu-22_10-amd64]
 #   image: registry.nic.cz/labs/bird:ubuntu-22.10-amd64
 
-#Installation not available
 # pkg-ubuntu-23.04-amd64:
 #   <<: *pkg-deb
 #   needs: [build-ubuntu-23_04-amd64]
 #   image: registry.nic.cz/labs/bird:ubuntu-23.04-amd64
 
-#Installation not available
 # pkg-ubuntu-23.10-amd64:
 #   <<: *pkg-deb
 #   needs: [build-ubuntu-23_10-amd64]
 #   image: registry.nic.cz/labs/bird:ubuntu-23.10-amd64
 
-# Removed due to apkg breakage
-# pkg-ubuntu-24.04-amd64:
-#   <<: *pkg-deb
-#   needs: [build-ubuntu-24_04-amd64]
-#   image: registry.nic.cz/labs/bird:ubuntu-24.04-amd64
-
-# Removed due to apkg breakage
-# pkg-ubuntu-24.10-amd64:
-#   <<: *pkg-deb
-#   needs: [build-ubuntu-24_10-amd64]
-#   image: registry.nic.cz/labs/bird:ubuntu-24.10-amd64
-
-# Removed due to apkg breakage
-#pkg-opensuse-15.1-amd64:
-#  <<: *pkg-rpm-wa
-#  needs: [build-opensuse-15.1-amd64]
-#  image: registry.nic.cz/labs/bird:opensuse-15.1-amd64
-
-# Removed due to apkg breakage
-#pkg-opensuse-15.2-amd64:
-#  <<: *pkg-rpm-wa
-#  needs: [build-opensuse-15.2-amd64]
-#  image: registry.nic.cz/labs/bird:opensuse-15.2-amd64
-
-pkg-opensuse-15.3-amd64:
-  <<: *pkg-rpm-wa
-  needs: [build-opensuse-15.3-amd64]
-  image: registry.nic.cz/labs/bird:opensuse-15.3-amd64
-
-#installation not available
-# pkg-opensuse-15.4-amd64:
-#   <<: *pkg-rpm-wa
-#   needs: [build-opensuse-15.4-amd64]
-#   image: registry.nic.cz/labs/bird:opensuse-15.4-amd64
+pkg-ubuntu-24.04-amd64:
+  <<: *pkg-deb
+  needs: [build-ubuntu-24_04-amd64]
+  image: registry.nic.cz/labs/bird:ubuntu-24.04-amd64
 
-#installation not available
-# pkg-opensuse-15.5-amd64:
-#   <<: *pkg-rpm-wa
-#   needs: [build-opensuse-15.5-amd64]
-#   image: registry.nic.cz/labs/bird:opensuse-15.5-amd64
+pkg-ubuntu-24.10-amd64:
+  <<: *pkg-deb
+  needs: [build-ubuntu-24_10-amd64]
+  image: registry.nic.cz/labs/bird:ubuntu-24.10-amd64
 
 build-netlab:
   stage: build