From c1100484320edd8091114138023bae391015b212 Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Fri, 29 Nov 2019 16:12:13 +0100
Subject: [PATCH] ci: Update config and matrix

---
 .gitlab-ci.yml | 119 ++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 98 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d223912..5ed1016 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 stages:
   - build
   - test
+  - upload
 
 variables:
   DOCKER_IMAGE_BASE: registry.icinga.com/build-docker
@@ -11,10 +12,13 @@ variables:
   tags:
     - docker
   image: ${DOCKER_IMAGE_BASE}/${DOCKER_IMAGE}
-  before_script:
-    - echo "machine git.icinga.com login ${ICINGA_GITLAB_USER} password ${ICINGA_GITLAB_TOKEN}" >> $HOME/.netrc
   script:
     - icinga-build-package
+  cache:
+    key: "${CI_JOB_NAME}"
+    paths:
+      - ccache/
+      - 'icingadb.git'
   artifacts:
     paths:
       - build/*
@@ -29,38 +33,111 @@ variables:
     - find build/
     - icinga-build-test
 
-build centos 8:
-  variables:
-    DOCKER_IMAGE: centos/8:x86_64
+.upload: &upload
+  stage: upload
+  tags:
+    - docker
+  image: ${DOCKER_IMAGE_BASE}/upload
+  script:
+    - find build/
+    - icinga-build-upload-aptly
+  only:
+    - master
+    - tags
+
+###################################
+# EPEL
+###################################
+build/centos/8:
   <<: *build
+  variables:
+    DOCKER_IMAGE: centos/8
 
-test centos 8:
+test/centos/8:
+  <<: *test
   variables:
-    DOCKER_IMAGE: centos/8:x86_64
+    DOCKER_IMAGE: centos/8
   dependencies:
-    - build centos 8
-  <<: *test
+    - build/centos/8
 
-build opensuse 15.1:
-  variables:
-    DOCKER_IMAGE: opensuse/15.1:x86_64
+upload/epel/8:
+  <<: *upload
+  dependencies:
+    - build/centos/8
+
+build/centos/7:
   <<: *build
+  variables:
+    DOCKER_IMAGE: centos/7
 
-test opensuse 15.1:
+test/centos/7:
+  <<: *test
   variables:
-    DOCKER_IMAGE: opensuse/15.1:x86_64
+    DOCKER_IMAGE: centos/7
   dependencies:
-    - build opensuse 15.1
-  <<: *test
+    - build/centos/7
+
+upload/epel/7:
+  <<: *upload
+  dependencies:
+    - build/centos/7
+
+###################################
+# Fedora
+###################################
+build/fedora/31:
+  <<: *build
+  variables:
+    DOCKER_IMAGE: fedora/31
 
-build sles 15.1:
+test/fedora/31:
+  <<: *test
   variables:
-    DOCKER_IMAGE: sles/15.1:x86_64
+    DOCKER_IMAGE: fedora/31
+  dependencies:
+    - build/fedora/31
+
+upload/fedora/31:
+  <<: *upload
+  dependencies:
+    - build/fedora/31
+
+###################################
+# SLES
+###################################
+build/sles/15.1:
   <<: *build
+  variables:
+    DOCKER_IMAGE: sles/15.1
 
-test sles 15.1:
+test/sles/15.1:
+  <<: *test
   variables:
-    DOCKER_IMAGE: sles/15.1:x86_64
+    DOCKER_IMAGE: sles/15.1
   dependencies:
-    - build sles 15.1
+    - build/sles/15.1
+
+upload/SUSE/15.1:
+  <<: *upload
+  dependencies:
+    - build/sles/15.1
+
+###################################
+# openSUSE
+###################################
+build/opensuse/15.1:
+  <<: *build
+  variables:
+    DOCKER_IMAGE: opensuse/15.1
+
+test/opensuse/15.1:
   <<: *test
+  variables:
+    DOCKER_IMAGE: opensuse/15.1
+  dependencies:
+    - build/opensuse/15.1
+
+upload/openSUSE/15.1:
+  <<: *upload
+  dependencies:
+    - build/opensuse/15.1
-- 
GitLab