CI: Packaging cleanup

With the removal of APKG, we don't need to split out "-legacy" DEB with
old python, and "-wa" RPM with an obscure sed applied to specfile which
never actually did anything since added in 2021.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cb86fef1a13705621d683066ed9c87468e83cff..010aa85d2a5ffc16c4d303f8d077a15e814dc40f 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -170,16 +170,6 @@ docker-oracle-10-amd64:
     IMG_NAME: "oracle-10-amd64"
   <<: *docker-build
 
-docker-fedora-32-amd64:
-  variables:
-    IMG_NAME: "fedora-32-amd64"
-  <<: *docker-build
-
-docker-fedora-33-amd64:
-  variables:
-    IMG_NAME: "fedora-33-amd64"
-  <<: *docker-build
-
 docker-opensuse-15.0-amd64:
   variables:
     IMG_NAME: "opensuse-15.0-amd64"
@@ -215,6 +205,16 @@ docker-opensuse-16.0-amd64:
     IMG_NAME: "opensuse-16.0-amd64"
   <<: *docker-build
 
+docker-fedora-32-amd64:
+  variables:
+    IMG_NAME: "fedora-32-amd64"
+  <<: *docker-build
+
+docker-fedora-33-amd64:
+  variables:
+    IMG_NAME: "fedora-33-amd64"
+  <<: *docker-build
+
 docker-fedora-34-amd64:
   variables:
     IMG_NAME: "fedora-34-amd64"
@@ -265,9 +265,9 @@ docker-fedora-43-amd64:
     IMG_NAME: "fedora-43-amd64"
   <<: *docker-build
 
-docker-ubuntu-18.04-amd64:
+docker-debian-11-amd64:
   variables:
-    IMG_NAME: "ubuntu-18.04-amd64"
+    IMG_NAME: "debian-11-amd64"
   <<: *docker-build
 
 docker-debian-11-i386:
@@ -275,11 +275,6 @@ docker-debian-11-i386:
     IMG_NAME: "debian-11-i386"
   <<: *docker-build
 
-docker-debian-11-amd64:
-  variables:
-    IMG_NAME: "debian-11-amd64"
-  <<: *docker-build
-
 docker-debian-12-amd64:
   variables:
     IMG_NAME: "debian-12-amd64"
@@ -310,6 +305,11 @@ docker-debian-testing-i386:
     IMG_NAME: "debian-testing-i386"
   <<: *docker-build
 
+docker-ubuntu-18.04-amd64:
+  variables:
+    IMG_NAME: "ubuntu-18.04-amd64"
+  <<: *docker-build
+
 docker-ubuntu-20.04-amd64:
   variables:
     IMG_NAME: "ubuntu-20.04-amd64"
@@ -443,20 +443,6 @@ build-oracle-10-amd64:
       optional: true
   image: registry.nic.cz/labs/bird:oracle-10-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:
-    - job: docker-fedora-33-amd64
-      optional: true
-  image: registry.nic.cz/labs/bird:fedora-33-amd64
-
 build-opensuse-15.0-amd64:
   <<: *build-docker-linux-amd64
   needs:
@@ -506,6 +492,20 @@ 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:
+    - job: docker-fedora-33-amd64
+      optional: true
+  image: registry.nic.cz/labs/bird:fedora-33-amd64
+
 build-fedora-34-amd64:
   <<: *build-docker-linux-amd64
   needs:
@@ -576,12 +576,12 @@ build-fedora-43-amd64:
       optional: true
   image: registry.nic.cz/labs/bird:fedora-43-amd64
 
-build-ubuntu-18.04-amd64:
+build-debian-11-amd64:
   <<: *build-docker-linux-amd64
   needs:
-    - job: docker-ubuntu-18.04-amd64
+    - job: docker-debian-11-amd64
       optional: true
-  image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
+  image: registry.nic.cz/labs/bird:debian-11-amd64
 
 build-debian-11-i386:
   <<: *build-docker-linux-amd64
@@ -590,13 +590,6 @@ build-debian-11-i386:
       optional: true
   image: registry.nic.cz/labs/bird:debian-11-i386
 
-build-debian-11-amd64:
-  <<: *build-docker-linux-amd64
-  needs:
-    - job: docker-debian-11-amd64
-      optional: true
-  image: registry.nic.cz/labs/bird:debian-11-amd64
-
 build-debian-12-amd64:
   <<: *build-docker-linux-amd64
   needs:
@@ -639,6 +632,13 @@ build-debian-testing-i386:
       optional: true
   image: registry.nic.cz/labs/bird:debian-testing-i386
 
+build-ubuntu-18.04-amd64:
+  <<: *build-docker-linux-amd64
+  needs:
+    - job: docker-ubuntu-18.04-amd64
+      optional: true
+  image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
+
 build-ubuntu-20.04-amd64:
   <<: *build-docker-linux-amd64
   needs:
@@ -718,17 +718,6 @@ build-release:
       - pkg/pkgs/*
       - pkg/srcpkgs/*
 
-.pkg-deb-legacy: &pkg-deb-legacy
-  <<: *test-job
-  stage: pkg
-  script:
-    - if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then export BRANCH=mergerequest-$CI_MERGE_REQUEST_IID; else export BRANCH=$CI_COMMIT_BRANCH; fi
-    - tools/make-deb
-  artifacts:
-    paths:
-      - pkg/pkgs/*
-      - pkg/srcpkgs/*
-
 .pkg-rpm: &pkg-rpm
   <<: *test-job
   stage: pkg
@@ -740,22 +729,10 @@ build-release:
       - pkg/pkgs/*
       - pkg/srcpkgs/*
 
-.pkg-rpm-wa: &pkg-rpm-wa
-  <<: *test-job
-  stage: pkg
-  script:
-    - if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then export BRANCH=mergerequest-$CI_MERGE_REQUEST_IID; else export BRANCH=$CI_COMMIT_BRANCH; fi
-    - sed -i "s/runstatedir/with-runtimedir/" distro/pkg/rpm/bird.spec
-    - STABLE_BUILDDIR=true tools/make-rpm
-  artifacts:
-    paths:
-      - pkg/pkgs/*
-      - pkg/srcpkgs/*
-
 
 
 pkg-centos-7-amd64:
-  <<: *pkg-rpm-wa
+  <<: *pkg-rpm
   needs:
     - job: build-centos-7-amd64
       artifacts: false
@@ -766,7 +743,7 @@ pkg-centos-7-amd64:
     LC_ALL: en_US.UTF-8
 
 pkg-centos-8-amd64:
-  <<: *pkg-rpm-wa
+  <<: *pkg-rpm
   needs:
     - job: build-centos-8-amd64
       artifacts: false
@@ -774,7 +751,7 @@ pkg-centos-8-amd64:
   image: registry.nic.cz/labs/bird:centos-8-amd64
 
 pkg-rocky-08-amd64:
-  <<: *pkg-rpm-wa
+  <<: *pkg-rpm
   needs:
     - job: build-rocky-08-amd64
       artifacts: false
@@ -782,7 +759,7 @@ pkg-rocky-08-amd64:
   image: registry.nic.cz/labs/bird:rocky-08-amd64
 
 pkg-rocky-09-amd64:
-  <<: *pkg-rpm-wa
+  <<: *pkg-rpm
   needs:
     - job: build-rocky-09-amd64
       artifacts: false
@@ -790,7 +767,7 @@ pkg-rocky-09-amd64:
   image: registry.nic.cz/labs/bird:rocky-09-amd64
 
 pkg-oracle-08-amd64:
-  <<: *pkg-rpm-wa
+  <<: *pkg-rpm
   needs:
     - job: build-oracle-08-amd64
       artifacts: false
@@ -798,7 +775,7 @@ pkg-oracle-08-amd64:
   image: registry.nic.cz/labs/bird:oracle-08-amd64
 
 pkg-oracle-09-amd64:
-  <<: *pkg-rpm-wa
+  <<: *pkg-rpm
   needs:
     - job: build-oracle-09-amd64
       artifacts: false
@@ -806,31 +783,15 @@ pkg-oracle-09-amd64:
   image: registry.nic.cz/labs/bird:oracle-09-amd64
 
 pkg-oracle-10-amd64:
-  <<: *pkg-rpm-wa
+  <<: *pkg-rpm
   needs:
     - job: build-oracle-10-amd64
       artifacts: false
     - job: build-release
   image: registry.nic.cz/labs/bird:oracle-10-amd64
 
-pkg-fedora-32-amd64:
-  <<: *pkg-rpm-wa
-  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-wa
-  needs:
-    - job: build-fedora-33-amd64
-      artifacts: false
-    - job: build-release
-  image: registry.nic.cz/labs/bird:fedora-33-amd64
-
 pkg-opensuse-15.0-amd64:
-  <<: *pkg-rpm-wa
+  <<: *pkg-rpm
   needs:
     - job: build-opensuse-15.0-amd64
       artifacts: false
@@ -838,7 +799,7 @@ pkg-opensuse-15.0-amd64:
   image: registry.nic.cz/labs/bird:opensuse-15.0-amd64
 
 pkg-opensuse-15.1-amd64:
-  <<: *pkg-rpm-wa
+  <<: *pkg-rpm
   needs:
     - job: build-opensuse-15.1-amd64
       artifacts: false
@@ -846,7 +807,7 @@ pkg-opensuse-15.1-amd64:
   image: registry.nic.cz/labs/bird:opensuse-15.1-amd64
 
 pkg-opensuse-15.2-amd64:
-  <<: *pkg-rpm-wa
+  <<: *pkg-rpm
   needs:
     - job: build-opensuse-15.2-amd64
       artifacts: false
@@ -854,7 +815,7 @@ pkg-opensuse-15.2-amd64:
   image: registry.nic.cz/labs/bird:opensuse-15.2-amd64
 
 pkg-opensuse-15.3-amd64:
-  <<: *pkg-rpm-wa
+  <<: *pkg-rpm
   needs:
     - job: build-opensuse-15.3-amd64
       artifacts: false
@@ -862,7 +823,7 @@ pkg-opensuse-15.3-amd64:
   image: registry.nic.cz/labs/bird:opensuse-15.3-amd64
 
 pkg-opensuse-15.4-amd64:
-  <<: *pkg-rpm-wa
+  <<: *pkg-rpm
   needs:
     - job: build-opensuse-15.4-amd64
       artifacts: false
@@ -870,7 +831,7 @@ pkg-opensuse-15.4-amd64:
   image: registry.nic.cz/labs/bird:opensuse-15.4-amd64
 
 pkg-opensuse-15.5-amd64:
-  <<: *pkg-rpm-wa
+  <<: *pkg-rpm
   needs:
     - job: build-opensuse-15.5-amd64
       artifacts: false
@@ -885,6 +846,22 @@ 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:
+    - job: build-fedora-33-amd64
+      artifacts: false
+    - job: build-release
+  image: registry.nic.cz/labs/bird:fedora-33-amd64
+
 pkg-fedora-34-amd64:
   <<: *pkg-rpm
   needs:
@@ -965,30 +942,22 @@ pkg-fedora-43-amd64:
     - job: build-release
   image: registry.nic.cz/labs/bird:fedora-43-amd64
 
-pkg-ubuntu-18.04-amd64:
-  <<: *pkg-deb-legacy
+pkg-debian-11-amd64:
+  <<: *pkg-deb
   needs:
-    - job: build-ubuntu-18.04-amd64
+    - job: build-debian-11-amd64
       artifacts: false
     - job: build-release
-  image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
+  image: registry.nic.cz/labs/bird:debian-11-amd64
 
 pkg-debian-11-i386:
-  <<: *pkg-deb-legacy
+  <<: *pkg-deb
   needs:
     - job: build-debian-11-i386
       artifacts: false
     - job: build-release
   image: registry.nic.cz/labs/bird:debian-11-i386
 
-pkg-debian-11-amd64:
-  <<: *pkg-deb-legacy
-  needs:
-    - job: build-debian-11-amd64
-      artifacts: false
-    - job: build-release
-  image: registry.nic.cz/labs/bird:debian-11-amd64
-
 pkg-debian-12-amd64:
   <<: *pkg-deb
   needs:
@@ -1037,6 +1006,14 @@ pkg-debian-testing-i386:
     - job: build-release
   image: registry.nic.cz/labs/bird:debian-testing-i386
 
+pkg-ubuntu-18.04-amd64:
+  <<: *pkg-deb
+  needs:
+    - job: build-ubuntu-18.04-amd64
+      artifacts: false
+    - job: build-release
+  image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
+
 pkg-ubuntu-20.04-amd64:
   <<: *pkg-deb
   needs:
@@ -1183,22 +1160,6 @@ install-oracle-10-amd64:
   variables:
     RPM_INSTALL_CMD: rpm -i
 
-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:
-    - job: pkg-fedora-33-amd64
-  image: registry.nic.cz/labs/bird:fedora-33-amd64
-  variables:
-    RPM_INSTALL_CMD: rpm -i
-
 install-opensuse-15.0-amd64:
   <<: *install-rpm
   needs:
@@ -1255,6 +1216,22 @@ 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:
+    - job: pkg-fedora-33-amd64
+  image: registry.nic.cz/labs/bird:fedora-33-amd64
+  variables:
+    RPM_INSTALL_CMD: rpm -i
+
 install-fedora-34-amd64:
   <<: *install-rpm
   needs:
@@ -1335,11 +1312,11 @@ install-fedora-43-amd64:
   variables:
     RPM_INSTALL_CMD: rpm -i
 
-install-ubuntu-18.04-amd64:
+install-debian-11-amd64:
   <<: *install-deb
   needs:
-    - job: pkg-ubuntu-18.04-amd64
-  image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
+    - job: pkg-debian-11-amd64
+  image: registry.nic.cz/labs/bird:debian-11-amd64
   variables:
 
 install-debian-11-i386:
@@ -1349,13 +1326,6 @@ install-debian-11-i386:
   image: registry.nic.cz/labs/bird:debian-11-i386
   variables:
 
-install-debian-11-amd64:
-  <<: *install-deb
-  needs:
-    - job: pkg-debian-11-amd64
-  image: registry.nic.cz/labs/bird:debian-11-amd64
-  variables:
-
 install-debian-12-amd64:
   <<: *install-deb
   needs:
@@ -1398,6 +1368,13 @@ install-debian-testing-i386:
   image: registry.nic.cz/labs/bird:debian-testing-i386
   variables:
 
+install-ubuntu-18.04-amd64:
+  <<: *install-deb
+  needs:
+    - job: pkg-ubuntu-18.04-amd64
+  image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
+  variables:
+
 install-ubuntu-20.04-amd64:
   <<: *install-deb
   needs:

diff --git a/misc/gitlab/data.yml.j2 b/misc/gitlab/data.yml.j2
index 9891c290f3a44b6658fd90b6a92eda3038fd0fef..16441fca5fab625a5da95c1950e30fecea6acfdf 100644 (file)
--- a/misc/gitlab/data.yml.j2
+++ b/misc/gitlab/data.yml.j2
@@ -9,61 +9,47 @@ distros:
     variables:
       LC_ALL: en_US.UTF-8
       CC: /opt/rh/devtoolset-8/root/usr/bin/gcc
-    type: pkg-rpm-wa
+    type: rpm
 
-  {% for name in (
-    'centos-8',
-    'rocky-08',
-    'rocky-09',
-    'oracle-08',
-    'oracle-09',
-    'oracle-10',
-    'fedora-32',
-    'fedora-33',
-  ) -%}
-  - name: {{ name }}-amd64
-    type: pkg-rpm-wa
+  - name: centos-8-amd64
+    type: rpm
+
+  # Rocky and Oracle Linux, forks of CentOS/RHEL
+  {% for num in ('08','09') -%}
+  - name: rocky-{{ num }}-amd64
+    type: rpm
+  {% endfor %}
+  {% for num in ('08','09','10') -%}
+  - name: oracle-{{ num }}-amd64
+    type: rpm
   {% endfor %}
 
-  # For some unknown reason we also require older Python packages
-  # for OpenSUSE even with the recent versions.
+  # Last 7 years of OpenSUSE
   {% for num in (0,1,2,3,4,5) -%}
   - name: opensuse-15.{{ num }}-amd64
-    type: pkg-rpm-wa
+    type: rpm
   {% endfor %}
   - name: opensuse-16.0-amd64
-    type: pkg-rpm
+    type: rpm
 
-  # Fedora regular builds
-  {% for num in (34, 35, 36, 37, 38, 39, 40, 41, 42, 43) -%}
+  # Last 12 versions of Fedora
+  {% for num in (32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43) -%}
   - name: fedora-{{ num }}-amd64
-    type: pkg-rpm
-  {% endfor %}
-
-  # Debian-based legacy builds
-  # Ubuntu 18.04 has issues with newer version of beautifulsoup4 and old python
-  # Debian 11 has issues with markupsafe v3.0.3
-  {% for name in (
-    'ubuntu-18.04-amd64',
-    'debian-11-i386',
-    'debian-11-amd64',
-  ) -%}
-  - name: {{ name }}
-    type: pkg-deb-legacy
+    type: rpm
   {% endfor %}
 
-  # Debian regular builds
-  {% for num in (12, 13, 'testing') -%}
+  # Debian from oldoldstable up to testing
+  {% for num in (11, 12, 13, 'testing') -%}
   {% for arch in ('amd64', 'i386') -%}
   - name: debian-{{num}}-{{arch}}
-    type: pkg-deb
+    type: deb
   {% endfor %}
   {% endfor %}
 
-  # Ubuntu regular builds
-  {% for num in ('20.04', '22.04', '24.04', '25.04', '25.10') -%}
+  # Last 7 years of Ubuntu LTS
+  {% for num in ('18.04', '20.04', '22.04', '24.04', '25.04', '25.10') -%}
   - name: ubuntu-{{ num }}-amd64
-    type: pkg-deb
+    type: deb
   {% endfor %}
 
 birdlab:

diff --git a/misc/gitlab/template.yml.j2 b/misc/gitlab/template.yml.j2
index a638d387afdd371ec603a5916cf12e82de0936ab..6529e8fc1bf739296b7631dc083f2e6955bcbd80 100644 (file)
--- a/misc/gitlab/template.yml.j2
+++ b/misc/gitlab/template.yml.j2
@@ -246,17 +246,6 @@ build-release:
       - pkg/pkgs/*
       - pkg/srcpkgs/*
 
-.pkg-deb-legacy: &pkg-deb-legacy
-  <<: *test-job
-  stage: pkg
-  script:
-    - if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then export BRANCH=mergerequest-$CI_MERGE_REQUEST_IID; else export BRANCH=$CI_COMMIT_BRANCH; fi
-    - tools/make-deb
-  artifacts:
-    paths:
-      - pkg/pkgs/*
-      - pkg/srcpkgs/*
-
 .pkg-rpm: &pkg-rpm
   <<: *test-job
   stage: pkg
@@ -268,22 +257,10 @@ build-release:
       - pkg/pkgs/*
       - pkg/srcpkgs/*
 
-.pkg-rpm-wa: &pkg-rpm-wa
-  <<: *test-job
-  stage: pkg
-  script:
-    - if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then export BRANCH=mergerequest-$CI_MERGE_REQUEST_IID; else export BRANCH=$CI_COMMIT_BRANCH; fi
-    - sed -i "s/runstatedir/with-runtimedir/" distro/pkg/rpm/bird.spec
-    - STABLE_BUILDDIR=true tools/make-rpm
-  artifacts:
-    paths:
-      - pkg/pkgs/*
-      - pkg/srcpkgs/*
-
 
 {% for dist in distros %}
 pkg-{{ dist["name"] }}:
-  <<: *{{ dist["type"] }}
+  <<: *pkg-{{ dist["type"] }}
   needs:
     - job: build-{{ dist["name"] }}
       artifacts: false
@@ -345,19 +322,14 @@ pkg-{{ dist["name"] }}:
 
 {% for dist in distros %}
 install-{{ dist["name"] }}:
-  <<: *{{ {
-    "pkg-rpm": "install-rpm",
-    "pkg-rpm-wa": "install-rpm",
-    "pkg-deb": "install-deb",
-    "pkg-deb-legacy": "install-deb",
-  }[dist["type"]] }}
+  <<: *install-{{ dist["type"] }}
   needs:
     - job: pkg-{{ dist["name"] }}
   image: registry.nic.cz/labs/bird:{{ dist["name"] }}
   variables:
 {%- if dist["name"][:12] == "opensuse-16." %}
     RPM_INSTALL_CMD: zypper --non-interactive --no-gpg-checks in
-{%- elif dist["type"][4:7] == "rpm" %}
+{%- elif dist["type"] == "rpm" %}
     RPM_INSTALL_CMD: rpm -i
 {%- endif %}
 {% endfor %}