Merge branch 'feature/backport-2.13' into '2.13'

Backport changes from master to 2.13 branch

See merge request packaging/rpm-icinga2!42
This commit is contained in:
Julian Brost 2022-01-07 15:34:51 +00:00
commit 63ea1e2508

View File

@ -123,24 +123,6 @@ upload/fedora/34:
dependencies: dependencies:
- build/fedora/34 - build/fedora/34
build/fedora/33:
<<: *build
variables:
DOCKER_IMAGE: fedora/33
RPM_BUILD_NCPUS: '1'
test/fedora/33:
<<: *test
variables:
DOCKER_IMAGE: fedora/33
dependencies:
- build/fedora/33
upload/fedora/33:
<<: *upload
dependencies:
- build/fedora/33
################################### ###################################
# SLES # SLES
################################### ###################################
@ -161,23 +143,6 @@ upload/SUSE/15.3:
dependencies: dependencies:
- build/sles/15.3 - build/sles/15.3
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/12.5: build/sles/12.5:
<<: *build <<: *build
variables: variables:
@ -214,20 +179,3 @@ upload/openSUSE/15.3:
<<: *upload <<: *upload
dependencies: dependencies:
- build/opensuse/15.3 - build/opensuse/15.3
build/opensuse/15.2:
<<: *build
variables:
DOCKER_IMAGE: opensuse/15.2
test/opensuse/15.2:
<<: *test
variables:
DOCKER_IMAGE: opensuse/15.2
dependencies:
- build/opensuse/15.2
upload/openSUSE/15.2:
<<: *upload
dependencies:
- build/opensuse/15.2