Merge branch 'bugfix/backport-2.12' into '2.12'

Backport changes from master to 2.12 branch

See merge request !24

.gitlab-ci.yml

@@ -66,6 +66,48 @@ variables:
 # Debian
 ###################################
 
+# bullseye
+debian/bullseye:
+  <<: *source
+  variables:
+    DOCKER_IMAGE: debian/bullseye
+
+debian/bullseye:x86_64:
+  <<: *binary
+  variables:
+    DOCKER_IMAGE: debian/bullseye
+  dependencies:
+    - debian/bullseye
+
+test/debian/bullseye:x86_64:
+  <<: *test
+  variables:
+    DOCKER_IMAGE: debian/bullseye
+  dependencies:
+    - debian/bullseye:x86_64
+
+debian/bullseye:x86:
+  <<: *binary
+  variables:
+    DOCKER_IMAGE: debian/bullseye:x86
+  dependencies:
+    - debian/bullseye
+
+test/debian/bullseye:x86:
+  <<: *test
+  variables:
+    DOCKER_IMAGE: debian/bullseye:x86
+  dependencies:
+    - debian/bullseye:x86
+    - debian/bullseye:x86_64
+
+upload/debian/bullseye:
+  <<: *upload
+  dependencies:
+    - debian/bullseye:x86
+    - debian/bullseye:x86_64
+    - debian/bullseye
+
 # buster
 debian/buster:
   <<: *source
@@ -84,7 +126,7 @@ test/debian/buster:x86_64:
   variables:
     DOCKER_IMAGE: debian/buster
   dependencies:
-    - debian/buster
+    - debian/buster:x86_64
 
 debian/buster:x86:
   <<: *binary
@@ -126,7 +168,7 @@ test/debian/stretch:x86_64:
   variables:
     DOCKER_IMAGE: debian/stretch
   dependencies:
-    - debian/stretch
+    - debian/stretch:x86_64
 
 debian/stretch:x86:
   <<: *binary
@@ -154,58 +196,58 @@ upload/debian/stretch:
 # Ubuntu
 ###################################
 
-# hirsute
-ubuntu/hirsute:
+# impish
+ubuntu/impish:
   <<: *source
   variables:
-    DOCKER_IMAGE: ubuntu/hirsute
+    DOCKER_IMAGE: ubuntu/impish
 
-ubuntu/hirsute:x86_64:
+ubuntu/impish:x86_64:
   <<: *binary
   variables:
-    DOCKER_IMAGE: ubuntu/hirsute
-    DEB_BUILD_OPTIONS: parallel=4
+    DOCKER_IMAGE: ubuntu/impish
   dependencies:
-    - ubuntu/hirsute
+    - ubuntu/impish
 
-test/ubuntu/hirsute:x86_64:
+test/ubuntu/impish:x86_64:
   <<: *test
   variables:
-    DOCKER_IMAGE: ubuntu/hirsute
+    DOCKER_IMAGE: ubuntu/impish
   dependencies:
-    - ubuntu/hirsute
+    - ubuntu/impish:x86_64
 
-upload/ubuntu/hirsute:
+upload/ubuntu/impish:
   <<: *upload
   dependencies:
-    - ubuntu/hirsute:x86_64
-    - ubuntu/hirsute
+    - ubuntu/impish:x86_64
+    - ubuntu/impish
 
-# groovy
-ubuntu/groovy:
+# hirsute
+ubuntu/hirsute:
   <<: *source
   variables:
-    DOCKER_IMAGE: ubuntu/groovy
+    DOCKER_IMAGE: ubuntu/hirsute
 
-ubuntu/groovy:x86_64:
+ubuntu/hirsute:x86_64:
   <<: *binary
   variables:
-    DOCKER_IMAGE: ubuntu/groovy
+    DOCKER_IMAGE: ubuntu/hirsute
+    DEB_BUILD_OPTIONS: parallel=4
   dependencies:
-    - ubuntu/groovy
+    - ubuntu/hirsute
 
-test/ubuntu/groovy:x86_64:
+test/ubuntu/hirsute:x86_64:
   <<: *test
   variables:
-    DOCKER_IMAGE: ubuntu/groovy
+    DOCKER_IMAGE: ubuntu/hirsute
   dependencies:
-    - ubuntu/groovy
+    - ubuntu/hirsute:x86_64
 
-upload/ubuntu/groovy:
+upload/ubuntu/hirsute:
   <<: *upload
   dependencies:
-    - ubuntu/groovy:x86_64
-    - ubuntu/groovy
+    - ubuntu/hirsute:x86_64
+    - ubuntu/hirsute
 
 ubuntu/focal:
   <<: *source
@@ -224,7 +266,7 @@ test/ubuntu/focal:x86_64:
   variables:
     DOCKER_IMAGE: ubuntu/focal
   dependencies:
-    - ubuntu/focal
+    - ubuntu/focal:x86_64
 
 upload/ubuntu/focal:
   <<: *upload
@@ -232,6 +274,7 @@ upload/ubuntu/focal:
     - ubuntu/focal:x86_64
     - ubuntu/focal
 
+# bionic
 ubuntu/bionic:
   <<: *source
   variables:
@@ -249,7 +292,7 @@ test/ubuntu/bionic:x86_64:
   variables:
     DOCKER_IMAGE: ubuntu/bionic
   dependencies:
-    - ubuntu/bionic
+    - ubuntu/bionic:x86_64
 
 ubuntu/bionic:x86:
   <<: *binary

debian/watch

@@ -2,4 +2,4 @@ version=3
 # filenamemangle -> prepending icinga2 if only tag name
 # versionmangle  -> convert version addition to ~ version
 opts=filenamemangle=s/.+\/(?:icinga2-|v)([\d.]+(?:-.+)?).tar.gz/icinga2-$1.tar.gz/,versionmangle=s/^([\d.]+)-(.+)?/$1~$2/ \
-https://github.com/Icinga/icinga2/releases .*/(?:icinga2-|v)([\d.]+(?:-.+)?).tar.gz
+https://github.com/Icinga/icinga2/tags .*/(?:icinga2-|v)([\d.]+(?:-.+)?).tar.gz