Fix dependecy issue with bs4 on legacy distros

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db6902938a77e185536e5def45c5ab829d6ce496..4c35f7df56ff385dacb2b26e24283bd996cfc698 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -472,6 +472,20 @@ build-only-static:
     paths:
       - pkg/pkgs/*
 
+.pkg-deb-legacy: &pkg-deb-legacy
+  stage: pkg
+  script:
+    # create venv only if it's installed
+    - if python3 -m venv venv; then . venv/bin/activate; fi
+    # install older version of bs4 that does not use python version >= 3.6
+    - pip3 install beautifulsoup4==4.11.2 
+    - pip3 install apkg
+    - BRANCH=$CI_COMMIT_BRANCH ARCHIVE_DOCS=false apkg build
+    #- apkg install -y pkg/pkgs/*/*/*.deb
+  artifacts:
+    paths:
+      - pkg/pkgs/*
+
 .pkg-rpm: &pkg-rpm
   stage: pkg
   script:
@@ -486,6 +500,8 @@ build-only-static:
   stage: pkg
   script:
     - sed -i "s/runstatedir/with-runtimedir/" distro/pkg/rpm/bird.spec
+    # install older version of bs4 that does not use python version >= 3.6
+    - pip3 install beautifulsoup4==4.11.2
     - pip3 install apkg
     - BRANCH=$CI_COMMIT_BRANCH ARCHIVE_DOCS=false apkg build
     #- apkg install -y pkg/pkgs/*/*/*.rpm
@@ -582,17 +598,15 @@ pkg-centos-7-amd64:
   needs: [build-centos-7-amd64]
   image: registry.nic.cz/labs/bird:centos-7-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-centos-8-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-centos-8-amd64]
+  image: registry.nic.cz/labs/bird:centos-8-amd64
 
-# Removed due to apkg breakage
-#pkg-ubuntu-18.04-amd64:
-#  <<: *pkg-deb
-#  needs: [build-ubuntu-18_04-amd64]
-#  image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
+pkg-ubuntu-18.04-amd64:
+  <<: *pkg-deb-legacy
+  needs: [build-ubuntu-18_04-amd64]
+  image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
 
 pkg-ubuntu-20.04-amd64:
   <<: *pkg-deb
@@ -614,17 +628,15 @@ pkg-ubuntu-24.10-amd64:
   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.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