ci: Update os matrix

This commit is contained in:
Markus Frosch 2019-08-30 14:44:06 +02:00
parent 9e7a0c509c
commit 6d5401e7a5
1 changed files with 17 additions and 34 deletions

View File

@ -20,7 +20,7 @@ variables:
key: "${CI_JOB_NAME}"
paths:
- ccache/
- 'icinga*.git'
- 'icingaweb2-module-director.git'
artifacts:
paths:
- build/*
@ -104,22 +104,22 @@ upload/fedora/30:
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
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
@ -158,23 +158,6 @@ upload/SUSE/12.4:
dependencies:
- 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
###################################