ci: Update build matrix

This commit is contained in:
Markus Frosch 2019-07-12 15:47:58 +02:00
parent 9e1e5572f7
commit a893925b3a

View File

@ -42,11 +42,11 @@ variables:
script: script:
- find build/ - find build/
- icinga-build-upload-aptly - icinga-build-upload-aptly
# TODO: enable when switching to GitLab CI
only: only:
- nonexisting_branch - nonexisting_branch
# - tags # TODO: enable when switching to GitLab CI
# - master # - master
# - tags
################################### ###################################
# EPEL # EPEL
@ -159,23 +159,6 @@ upload/SUSE/12.4:
dependencies: dependencies:
- build/sles/12.4 - build/sles/12.4
build/sles/12.3:
<<: *build
variables:
DOCKER_IMAGE: sles/12.3
test/sles/12.3:
<<: *test
variables:
DOCKER_IMAGE: sles/12.3
dependencies:
- build/sles/12.3
upload/SUSE/12.3:
<<: *upload
dependencies:
- build/sles/12.3
################################### ###################################
# openSUSE # openSUSE
################################### ###################################
@ -195,20 +178,3 @@ upload/openSUSE/15.0:
<<: *upload <<: *upload
dependencies: dependencies:
- build/opensuse/15.0 - build/opensuse/15.0
build/opensuse/42.3:
<<: *build
variables:
DOCKER_IMAGE: opensuse/42.3
test/opensuse/42.3:
<<: *test
variables:
DOCKER_IMAGE: opensuse/42.3
dependencies:
- build/opensuse/42.3
upload/openSUSE/42.3:
<<: *upload
dependencies:
- build/opensuse/42.3