diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c218975705a9646cbc37ab9db8bff905b136d827..f98348409eb59270c87e23268fab70777b27b580 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,60 +46,6 @@ 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 ################################### @@ -120,162 +66,6 @@ upload/fedora/33: dependencies: - build/fedora/33 -build/fedora/32: - <<: *build - variables: - DOCKER_IMAGE: fedora/32 - -test/fedora/32: - <<: *test - variables: - DOCKER_IMAGE: fedora/32 - dependencies: - - build/fedora/32 - -upload/fedora/32: - <<: *upload - dependencies: - - build/fedora/32 - -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.2: - <<: *build - variables: - DOCKER_IMAGE: sles/15.2 - -test/sles/15.2: - <<: *test - variables: - DOCKER_IMAGE: sles/15.2 - dependencies: - - build/sles/15.2 - -upload/SUSE/15.2: - <<: *upload - dependencies: - - build/sles/15.2 - -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: - DOCKER_IMAGE: sles/12.5 - -test/sles/12.5: - <<: *test - variables: - DOCKER_IMAGE: sles/12.5 - dependencies: - - build/sles/12.5 - -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 ################################### @@ -295,37 +85,3 @@ upload/openSUSE/15.2: <<: *upload dependencies: - build/opensuse/15.2 - -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 ceb7fa4e4e17e8a501cd40e5149913d2c07172a9..919b221806cfdc8b779b28130b309dcdc3e1ee8c 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -832,7 +832,7 @@ fi %{_datadir}/nano/%{name}.nanorc %changelog -* Mon Nov 16 2020 Noah Hilverling <noah.hilverling@icinga.com> 2.11.7-1 +* Mon Nov 16 2020 Noah Hilverling <noah.hilverling@icinga.com> 2.11.7-2 - Update to 2.11.7 * Tue Oct 13 2020 Julian Brost <julian.brost@icinga.com> 2.11.6-1