ci: Rebuild matrix for multi arch builds

.gitlab-ci.yml

 stages:
-  - build
+  - source
+  - binary
   - test
   - upload
 
@@ -8,23 +9,38 @@ variables:
   ICINGA_BUILD_TYPE: snapshot
   #ICINGA_BUILD_UPSTREAM_BRANCH:
 
-.build: &build
-  stage: build
+.source: &source
+  stage: source
   tags:
     - docker
   image: ${DOCKER_IMAGE_BASE}/${DOCKER_IMAGE}
   script:
-    - icinga-build-package
+    - icinga-build-deb-source
   cache:
     key: "${CI_JOB_NAME}"
     paths:
-      - ccache/
       - 'icinga2.git'
   artifacts:
     paths:
       - build/*
     expire_in: 1 week
 
+.binary: &binary
+  stage: binary
+  tags:
+    - docker
+  image: ${DOCKER_IMAGE_BASE}/${DOCKER_IMAGE}
+  script:
+    - icinga-build-deb-binary
+  cache:
+    key: "${CI_JOB_NAME}"
+    paths:
+      - ccache/
+  artifacts:
+    paths:
+      - build/*
+    expire_in: 1 week
+
 .test: &test
   stage: test
   tags:
@@ -49,166 +65,217 @@ variables:
 ###################################
 # Debian
 ###################################
-build/debian/buster:
-  <<: *build
+
+# buster
+debian/buster:
+  <<: *source
+  variables:
+    DOCKER_IMAGE: debian/buster
+
+debian/buster:x86_64:
+  <<: *binary
   variables:
     DOCKER_IMAGE: debian/buster
+  dependencies:
+    - debian/buster
 
-test/debian/buster:
+test/debian/buster:x86_64:
   <<: *test
   variables:
     DOCKER_IMAGE: debian/buster
   dependencies:
-    - build/debian/buster
+    - debian/buster
 
-build/debian/buster:x86:
-  <<: *build
+debian/buster:x86:
+  <<: *binary
   variables:
     DOCKER_IMAGE: debian/buster:x86
+  dependencies:
+    - debian/buster
 
 test/debian/buster:x86:
   <<: *test
   variables:
     DOCKER_IMAGE: debian/buster:x86
   dependencies:
-    - build/debian/buster:x86
-    - build/debian/buster
+    - debian/buster:x86
+    - debian/buster:x86_64
 
 upload/debian/buster:
   <<: *upload
   dependencies:
-    - build/debian/buster:x86
-    - build/debian/buster
+    - debian/buster:x86
+    - debian/buster:x86_64
+    - debian/buster
 
-build/debian/stretch:
-  <<: *build
+# stretch
+debian/stretch:
+  <<: *source
   variables:
     DOCKER_IMAGE: debian/stretch
 
-test/debian/stretch:
+debian/stretch:x86_64:
+  <<: *binary
+  variables:
+    DOCKER_IMAGE: debian/stretch
+  dependencies:
+    - debian/stretch
+
+test/debian/stretch:x86_64:
   <<: *test
   variables:
     DOCKER_IMAGE: debian/stretch
   dependencies:
-    - build/debian/stretch
+    - debian/stretch
 
-build/debian/stretch:x86:
-  <<: *build
+debian/stretch:x86:
+  <<: *binary
   variables:
     DOCKER_IMAGE: debian/stretch:x86
+  dependencies:
+    - debian/stretch
 
 test/debian/stretch:x86:
   <<: *test
   variables:
     DOCKER_IMAGE: debian/stretch:x86
   dependencies:
-    - build/debian/stretch:x86
-    - build/debian/stretch
+    - debian/stretch:x86
+    - debian/stretch:x86_64
 
 upload/debian/stretch:
   <<: *upload
   dependencies:
-    - build/debian/stretch:x86
-    - build/debian/stretch
+    - debian/stretch:x86
+    - debian/stretch:x86_64
+    - debian/stretch
 
 ###################################
 # Ubuntu
 ###################################
-build/ubuntu/disco:
-  <<: *build
+
+# disco
+ubuntu/disco:
+  <<: *source
   variables:
-    ICINGA_BUILD_DEB_FLAVOR: stretch
     DOCKER_IMAGE: ubuntu/disco
 
-test/ubuntu/disco:
+ubuntu/disco:x86_64:
+  <<: *binary
+  variables:
+    DOCKER_IMAGE: ubuntu/disco
+  dependencies:
+    - ubuntu/disco
+
+test/ubuntu/disco:x86_64:
   <<: *test
   variables:
     DOCKER_IMAGE: ubuntu/disco
   dependencies:
-    - build/ubuntu/disco
+    - ubuntu/disco
 
-build/ubuntu/disco:x86:
-  <<: *build
+ubuntu/disco:x86:
+  <<: *binary
   variables:
-    ICINGA_BUILD_DEB_FLAVOR: stretch
     DOCKER_IMAGE: ubuntu/disco:x86
+  dependencies:
+    - ubuntu/disco
 
 test/ubuntu/disco:x86:
   <<: *test
   variables:
     DOCKER_IMAGE: ubuntu/disco:x86
   dependencies:
-    - build/ubuntu/disco:x86
-    - build/ubuntu/disco
+    - ubuntu/disco:x86
+    - ubuntu/disco:x86_64
 
 upload/ubuntu/disco:
   <<: *upload
   dependencies:
-    - build/ubuntu/disco:x86
-    - build/ubuntu/disco
+    - ubuntu/disco:x86
+    - ubuntu/disco:x86_64
+    - ubuntu/disco
 
-build/ubuntu/bionic:
-  <<: *build
+# bionic
+ubuntu/bionic:
+  <<: *source
   variables:
-    ICINGA_BUILD_DEB_FLAVOR: stretch
     DOCKER_IMAGE: ubuntu/bionic
 
-test/ubuntu/bionic:
+ubuntu/bionic:x86_64:
+  <<: *binary
+  variables:
+    DOCKER_IMAGE: ubuntu/bionic
+  dependencies:
+    - ubuntu/bionic
+
+test/ubuntu/bionic:x86_64:
   <<: *test
   variables:
     DOCKER_IMAGE: ubuntu/bionic
   dependencies:
-    - build/ubuntu/bionic
+    - ubuntu/bionic
 
-build/ubuntu/bionic:x86:
-  <<: *build
+ubuntu/bionic:x86:
+  <<: *binary
   variables:
-    ICINGA_BUILD_DEB_FLAVOR: stretch
     DOCKER_IMAGE: ubuntu/bionic:x86
+  dependencies:
+    - ubuntu/bionic
 
 test/ubuntu/bionic:x86:
   <<: *test
   variables:
     DOCKER_IMAGE: ubuntu/bionic:x86
   dependencies:
-    - build/ubuntu/bionic:x86
-    - build/ubuntu/bionic
+    - ubuntu/bionic:x86
+    - ubuntu/bionic:x86_64
 
 upload/ubuntu/bionic:
   <<: *upload
   dependencies:
-    - build/ubuntu/bionic:x86
-    - build/ubuntu/bionic
+    - ubuntu/bionic:x86
+    - ubuntu/bionic:x86_64
+    - ubuntu/bionic
 
-build/ubuntu/xenial:
-  <<: *build
+# xenial
+ubuntu/xenial:
+  <<: *source
   variables:
-    ICINGA_BUILD_DEB_FLAVOR: stretch
     DOCKER_IMAGE: ubuntu/xenial
 
-test/ubuntu/xenial:
+ubuntu/xenial:x86_64:
+  <<: *binary
+  variables:
+    DOCKER_IMAGE: ubuntu/xenial
+  dependencies:
+    - ubuntu/xenial
+
+test/ubuntu/xenial:x86_64:
   <<: *test
   variables:
     DOCKER_IMAGE: ubuntu/xenial
   dependencies:
-    - build/ubuntu/xenial
+    - ubuntu/xenial
 
-build/ubuntu/xenial:x86:
-  <<: *build
+ubuntu/xenial:x86:
+  <<: *binary
   variables:
-    ICINGA_BUILD_DEB_FLAVOR: stretch
     DOCKER_IMAGE: ubuntu/xenial:x86
+  dependencies:
+    - ubuntu/xenial
 
 test/ubuntu/xenial:x86:
   <<: *test
   variables:
     DOCKER_IMAGE: ubuntu/xenial:x86
   dependencies:
-    - build/ubuntu/xenial:x86
-    - build/ubuntu/xenial
+    - ubuntu/xenial:x86
+    - ubuntu/xenial:x86_64
 
 upload/ubuntu/xenial:
   <<: *upload
   dependencies:
-    - build/ubuntu/xenial:x86
-    - build/ubuntu/xenial
+    - ubuntu/xenial:x86
+    - ubuntu/xenial:x86_64
+    - ubuntu/xenial