diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2aea98b996ef2905df941e28160c5f1f283ce959..e03185a4bced7592f9abdebe0dd9006bec08b4dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
variables:
DOCKER_IMAGE_BASE: registry.icinga.com/build-docker
- ICINGA_BUILD_TYPE: snapshot
+ ICINGA_BUILD_TYPE: release
#ICINGA_BUILD_RELEASE_TYPE:
#ICINGA_BUILD_TYPE:
#ICINGA_BUILD_UPSTREAM_BRANCH:
@@ -48,151 +48,9 @@ variables:
- master
- tags
-###################################
-# EPEL
-###################################
-build/centos/8:
- <<: *build
- variables:
- DOCKER_IMAGE: centos/8
-
-test/centos/8:
- <<: *test
- variables:
- DOCKER_IMAGE: centos/8
- dependencies:
- - build/centos/8
-
-upload/epel/8:
- <<: *upload
- dependencies:
- - build/centos/8
-
-build/centos/7:
- <<: *build
- variables:
- DOCKER_IMAGE: centos/7
-
-test/centos/7:
- <<: *test
- variables:
- DOCKER_IMAGE: centos/7
- dependencies:
- - build/centos/7
-
-upload/epel/7:
- <<: *upload
- dependencies:
- - build/centos/7
-
-build/centos/6:
- <<: *build
- variables:
- DOCKER_IMAGE: centos/6
-
-test/centos/6:
- <<: *test
- variables:
- DOCKER_IMAGE: centos/6
- dependencies:
- - build/centos/6
-
-upload/epel/6:
- <<: *upload
- dependencies:
- - build/centos/6
-
-###################################
-# Fedora
-###################################
-build/fedora/31:
- <<: *build
- variables:
- DOCKER_IMAGE: fedora/31
-
-test/fedora/31:
- <<: *test
- variables:
- DOCKER_IMAGE: fedora/31
- dependencies:
- - build/fedora/31
-
-upload/fedora/31:
- <<: *upload
- dependencies:
- - build/fedora/31
-
-build/fedora/30:
- <<: *build
- variables:
- DOCKER_IMAGE: fedora/30
-
-test/fedora/30:
- <<: *test
- variables:
- DOCKER_IMAGE: fedora/30
- dependencies:
- - build/fedora/30
-
-upload/fedora/30:
- <<: *upload
- dependencies:
- - build/fedora/30
-
-build/fedora/29:
- <<: *build
- variables:
- DOCKER_IMAGE: fedora/29
-
-test/fedora/29:
- <<: *test
- variables:
- DOCKER_IMAGE: fedora/29
- dependencies:
- - build/fedora/29
-
-upload/fedora/29:
- <<: *upload
- dependencies:
- - build/fedora/29
-
###################################
# SLES
###################################
-build/sles/15.1:
- <<: *build
- variables:
- DOCKER_IMAGE: sles/15.1
-
-test/sles/15.1:
- <<: *test
- variables:
- DOCKER_IMAGE: sles/15.1
- dependencies:
- - build/sles/15.1
-
-upload/SUSE/15.1:
- <<: *upload
- dependencies:
- - build/sles/15.1
-
-build/sles/15.0:
- <<: *build
- variables:
- DOCKER_IMAGE: sles/15.0
-
-test/sles/15.0:
- <<: *test
- variables:
- DOCKER_IMAGE: sles/15.0
- dependencies:
- - build/sles/15.0
-
-upload/SUSE/15.0:
- <<: *upload
- dependencies:
- - build/sles/15.0
-
build/sles/12.5:
<<: *build
variables:
@@ -209,57 +67,3 @@ upload/SUSE/12.5:
<<: *upload
dependencies:
- build/sles/12.5
-
-build/sles/12.4:
- <<: *build
- variables:
- DOCKER_IMAGE: sles/12.4
-
-test/sles/12.4:
- <<: *test
- variables:
- DOCKER_IMAGE: sles/12.4
- dependencies:
- - build/sles/12.4
-
-upload/SUSE/12.4:
- <<: *upload
- dependencies:
- - build/sles/12.4
-
-###################################
-# 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
-
-build/opensuse/15.0:
- <<: *build
- variables:
- DOCKER_IMAGE: opensuse/15.0
-
-test/opensuse/15.0:
- <<: *test
- variables:
- DOCKER_IMAGE: opensuse/15.0
- dependencies:
- - build/opensuse/15.0
-
-upload/openSUSE/15.0:
- <<: *upload
- dependencies:
- - build/opensuse/15.0
diff --git a/icinga2.spec b/icinga2.spec
index 4f0b0641be6418300b6a8e8be87fad90229653e6..e6cbfa86afbaa49248d592f1f8767fad803da183 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -97,7 +97,7 @@ License: GPLv2+
%endif # suse
Group: System/Monitoring
Name: icinga2
-Version: 2.11.2
+Version: 2.11.3
Release: %{revision}%{?dist}
Url: https://www.icinga.com/
Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
@@ -832,6 +832,9 @@ fi
%{_datadir}/nano/%{name}.nanorc
%changelog
+* Mon Mar 02 2020 Henrik Triem <henrik.triem@icinga.com> 2.11.3-1
+- Update to 2.11.3
+
* Thu Oct 24 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.11.2-1
- Update to 2.11.2