ci: Update build matrix

.gitlab-ci.yml

@@ -42,13 +42,46 @@ variables:
   script:
     - find build/
     - icinga-build-upload-aptly
+  only:
+    - non_existing_branch
   # TODO: enable when switching to GitLab CI
-  #only:
+  #  - master
   #  - tags
 
 ###################################
 # Debian
 ###################################
+build/debian/buster:
+  <<: *build
+  variables:
+    DOCKER_IMAGE: debian/buster
+
+test/debian/buster:
+  <<: *test
+  variables:
+    DOCKER_IMAGE: debian/buster
+  dependencies:
+    - build/debian/buster
+
+build/debian/buster:x86:
+  <<: *build
+  variables:
+    DOCKER_IMAGE: debian/buster:x86
+
+test/debian/buster:x86:
+  <<: *test
+  variables:
+    DOCKER_IMAGE: debian/buster:x86
+  dependencies:
+    - build/debian/buster:x86
+    - build/debian/buster
+
+upload/debian/buster:
+  <<: *upload
+  dependencies:
+    - build/debian/buster:x86
+    - build/debian/buster
+
 build/debian/stretch:
   <<: *build
   variables:
@@ -80,40 +113,42 @@ upload/debian/stretch:
     - build/debian/stretch:x86
     - build/debian/stretch
 
-build/debian/jessie:
+###################################
+# Ubuntu
+###################################
+build/ubuntu/disco:
   <<: *build
   variables:
-    DOCKER_IMAGE: debian/jessie
+    ICINGA_BUILD_DEB_FLAVOR: stretch
+    DOCKER_IMAGE: ubuntu/disco
 
-test/debian/jessie:
+test/ubuntu/disco:
   <<: *test
   variables:
-    DOCKER_IMAGE: debian/jessie
+    DOCKER_IMAGE: ubuntu/disco
   dependencies:
-    - build/debian/jessie
+    - build/ubuntu/disco
 
-build/debian/jessie:x86:
+build/ubuntu/disco:x86:
   <<: *build
   variables:
-    DOCKER_IMAGE: debian/jessie:x86
+    ICINGA_BUILD_DEB_FLAVOR: stretch
+    DOCKER_IMAGE: ubuntu/disco:x86
 
-test/debian/jessie:x86:
+test/ubuntu/disco:x86:
   <<: *test
   variables:
-    DOCKER_IMAGE: debian/jessie:x86
+    DOCKER_IMAGE: ubuntu/disco:x86
   dependencies:
-    - build/debian/jessie:x86
-    - build/debian/jessie
+    - build/ubuntu/disco:x86
+    - build/ubuntu/disco
 
-upload/debian/jessie:
+upload/ubuntu/disco:
   <<: *upload
   dependencies:
-    - build/debian/jessie:x86
-    - build/debian/jessie
+    - build/ubuntu/disco:x86
+    - build/ubuntu/disco
 
-###################################
-# Ubuntu
-###################################
 build/ubuntu/bionic:
   <<: *build
   variables:
@@ -179,34 +214,3 @@ upload/ubuntu/xenial:
   dependencies:
     - build/ubuntu/xenial:x86
     - build/ubuntu/xenial
-
-build/ubuntu/trusty:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: ubuntu/trusty
-
-test/ubuntu/trusty:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: ubuntu/trusty
-  dependencies:
-    - build/ubuntu/trusty
-
-build/ubuntu/trusty:x86:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: ubuntu/trusty:x86
-
-test/ubuntu/trusty:x86:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: ubuntu/trusty:x86
-  dependencies:
-    - build/ubuntu/trusty:x86
-    - build/ubuntu/trusty
-
-upload/ubuntu/trusty:
-  <<: *upload
-  dependencies:
-    - build/ubuntu/trusty:x86
-    - build/ubuntu/trusty