CI: fix broken debian-11-i386 packaging

The error occured when trying to install 'markupsafe' v3.0.3 python package (dependency of 'apkg') on debian-11-i386 arch.
Fixed by preinstalling older version of 'markupsafe' package before the installation of 'apkg'.

Since the behavior is added to 'pkg-deb-legacy' it also effects packaging of ubuntu-18.04-amd64.
Also debian-11-amd64 is moved to 'pkg-deb-legacy' together with effected debian-11-i386 just for code clarity.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9866b5a2c4d58d1c29a8fabd53bfdbd3b2837472..b429642dda2de9676475a0f6b0e33f4d6310bcc3 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -246,24 +246,24 @@ docker-ubuntu-18.04-amd64:
     IMG_NAME: "ubuntu-18.04-amd64"
   <<: *docker-build
 
-docker-debian-10-amd64:
+docker-debian-11-i386:
   variables:
-    IMG_NAME: "debian-10-amd64"
+    IMG_NAME: "debian-11-i386"
   <<: *docker-build
 
-docker-debian-10-i386:
+docker-debian-11-amd64:
   variables:
-    IMG_NAME: "debian-10-i386"
+    IMG_NAME: "debian-11-amd64"
   <<: *docker-build
 
-docker-debian-11-amd64:
+docker-debian-10-amd64:
   variables:
-    IMG_NAME: "debian-11-amd64"
+    IMG_NAME: "debian-10-amd64"
   <<: *docker-build
 
-docker-debian-11-i386:
+docker-debian-10-i386:
   variables:
-    IMG_NAME: "debian-11-i386"
+    IMG_NAME: "debian-10-i386"
   <<: *docker-build
 
 docker-debian-12-amd64:
@@ -529,33 +529,33 @@ build-ubuntu-18.04-amd64:
       optional: true
   image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
 
-build-debian-10-amd64:
+build-debian-11-i386:
   <<: *build-docker-linux-amd64
   needs:
-    - job: docker-debian-10-amd64
+    - job: docker-debian-11-i386
       optional: true
-  image: registry.nic.cz/labs/bird:debian-10-amd64
+  image: registry.nic.cz/labs/bird:debian-11-i386
 
-build-debian-10-i386:
+build-debian-11-amd64:
   <<: *build-docker-linux-amd64
   needs:
-    - job: docker-debian-10-i386
+    - job: docker-debian-11-amd64
       optional: true
-  image: registry.nic.cz/labs/bird:debian-10-i386
+  image: registry.nic.cz/labs/bird:debian-11-amd64
 
-build-debian-11-amd64:
+build-debian-10-amd64:
   <<: *build-docker-linux-amd64
   needs:
-    - job: docker-debian-11-amd64
+    - job: docker-debian-10-amd64
       optional: true
-  image: registry.nic.cz/labs/bird:debian-11-amd64
+  image: registry.nic.cz/labs/bird:debian-10-amd64
 
-build-debian-11-i386:
+build-debian-10-i386:
   <<: *build-docker-linux-amd64
   needs:
-    - job: docker-debian-11-i386
+    - job: docker-debian-10-i386
       optional: true
-  image: registry.nic.cz/labs/bird:debian-11-i386
+  image: registry.nic.cz/labs/bird:debian-10-i386
 
 build-debian-12-amd64:
   <<: *build-docker-linux-amd64
@@ -683,6 +683,7 @@ build-release:
     # apkg depends on bs4, and unless we want to backport python 3.6
     # to ancient distros, we need to do this workaround
     - pip3 install beautifulsoup4==4.11.2
+    - pip3 install markupsafe==2.0.1
     - pip3 install apkg==$APKG_VERSION
     - apkg build -a bird-$(cat VERSION)*.tar.gz
   artifacts:
@@ -896,37 +897,37 @@ pkg-ubuntu-18.04-amd64:
     - job: build-release
   image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
 
-pkg-debian-10-amd64:
-  <<: *pkg-deb
+pkg-debian-11-i386:
+  <<: *pkg-deb-legacy
   needs:
-    - job: build-debian-10-amd64
+    - job: build-debian-11-i386
       artifacts: false
     - job: build-release
-  image: registry.nic.cz/labs/bird:debian-10-amd64
+  image: registry.nic.cz/labs/bird:debian-11-i386
 
-pkg-debian-10-i386:
-  <<: *pkg-deb
+pkg-debian-11-amd64:
+  <<: *pkg-deb-legacy
   needs:
-    - job: build-debian-10-i386
+    - job: build-debian-11-amd64
       artifacts: false
     - job: build-release
-  image: registry.nic.cz/labs/bird:debian-10-i386
+  image: registry.nic.cz/labs/bird:debian-11-amd64
 
-pkg-debian-11-amd64:
+pkg-debian-10-amd64:
   <<: *pkg-deb
   needs:
-    - job: build-debian-11-amd64
+    - job: build-debian-10-amd64
       artifacts: false
     - job: build-release
-  image: registry.nic.cz/labs/bird:debian-11-amd64
+  image: registry.nic.cz/labs/bird:debian-10-amd64
 
-pkg-debian-11-i386:
+pkg-debian-10-i386:
   <<: *pkg-deb
   needs:
-    - job: build-debian-11-i386
+    - job: build-debian-10-i386
       artifacts: false
     - job: build-release
-  image: registry.nic.cz/labs/bird:debian-11-i386
+  image: registry.nic.cz/labs/bird:debian-10-i386
 
 pkg-debian-12-amd64:
   <<: *pkg-deb
@@ -1190,17 +1191,11 @@ install-ubuntu-18.04-amd64:
     - job: pkg-ubuntu-18.04-amd64
   image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
 
-install-debian-10-amd64:
-  <<: *install-deb
-  needs:
-    - job: pkg-debian-10-amd64
-  image: registry.nic.cz/labs/bird:debian-10-amd64
-
-install-debian-10-i386:
+install-debian-11-i386:
   <<: *install-deb
   needs:
-    - job: pkg-debian-10-i386
-  image: registry.nic.cz/labs/bird:debian-10-i386
+    - job: pkg-debian-11-i386
+  image: registry.nic.cz/labs/bird:debian-11-i386
 
 install-debian-11-amd64:
   <<: *install-deb
@@ -1208,11 +1203,17 @@ install-debian-11-amd64:
     - job: pkg-debian-11-amd64
   image: registry.nic.cz/labs/bird:debian-11-amd64
 
-install-debian-11-i386:
+install-debian-10-amd64:
   <<: *install-deb
   needs:
-    - job: pkg-debian-11-i386
-  image: registry.nic.cz/labs/bird:debian-11-i386
+    - job: pkg-debian-10-amd64
+  image: registry.nic.cz/labs/bird:debian-10-amd64
+
+install-debian-10-i386:
+  <<: *install-deb
+  needs:
+    - job: pkg-debian-10-i386
+  image: registry.nic.cz/labs/bird:debian-10-i386
 
 install-debian-12-amd64:
   <<: *install-deb

diff --git a/misc/gitlab/data.yml.j2 b/misc/gitlab/data.yml.j2
index 4eea06c78efefdd831dd40afdf55d24a9958d094..555a548e1976c1f1755b406253d545e03eb02053 100644 (file)
--- a/misc/gitlab/data.yml.j2
+++ b/misc/gitlab/data.yml.j2
@@ -35,12 +35,20 @@ distros:
     type: pkg-rpm
   {% endfor %}
 
-  # Ubuntu legacy build
-  - name: ubuntu-18.04-amd64
+  # 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
+  {% endfor %}
 
   # Debian regular builds
-  {% for num in (10, 11, 12, 13, 'testing') -%}
+  {% for num in (10, 12, 13, 'testing') -%}
   {% for arch in ('amd64', 'i386') -%}
   - name: debian-{{num}}-{{arch}}
     type: pkg-deb

diff --git a/misc/gitlab/template.yml.j2 b/misc/gitlab/template.yml.j2
index ef42ca8818c7e9668216b30649cf5cbfc1b6124b..27dc3810828c7a24b651aa7c9ba65dd39e8a833b 100644 (file)
--- a/misc/gitlab/template.yml.j2
+++ b/misc/gitlab/template.yml.j2
@@ -259,6 +259,7 @@ build-release:
     # apkg depends on bs4, and unless we want to backport python 3.6
     # to ancient distros, we need to do this workaround
     - pip3 install beautifulsoup4==4.11.2
+    - pip3 install markupsafe==2.0.1
     - pip3 install apkg==$APKG_VERSION
     - apkg build -a bird-$(cat VERSION)*.tar.gz
   artifacts: