Fix gitlab-ci.yml

This commit is contained in:
Henrik Triem 2022-06-30 06:08:17 +02:00
parent 4d5be1257c
commit f4b76e0836
1 changed files with 22 additions and 13 deletions

View File

@ -5,7 +5,7 @@ stages:
variables: variables:
DOCKER_IMAGE_BASE: registry.icinga.com/build-docker DOCKER_IMAGE_BASE: registry.icinga.com/build-docker
#ICINGA_BUILD_TYPE: snapshot ICINGA_BUILD_TYPE: snapshot
#ICINGA_BUILD_UPSTREAM_BRANCH: #ICINGA_BUILD_UPSTREAM_BRANCH:
.build: &build .build: &build
@ -46,6 +46,9 @@ variables:
- master - master
- tags - tags
###################################
# Centos
###################################
build/centos/7: build/centos/7:
<<: *build <<: *build
variables: variables:
@ -56,13 +59,16 @@ test/centos/7:
variables: variables:
DOCKER_IMAGE: centos/7 DOCKER_IMAGE: centos/7
dependencies: dependencies:
- build/centos/7 - build/centos/7
upload/centos/7: upload/centos/7:
<<: *upload <<: *upload
dependencies: dependencies:
- build/centos/7 - build/centos/7
###################################
# Fedora
###################################
build/fedora/36: build/fedora/36:
<<: *build <<: *build
variables: variables:
@ -74,12 +80,12 @@ test/fedora/36:
variables: variables:
DOCKER_IMAGE: fedora/36 DOCKER_IMAGE: fedora/36
dependencies: dependencies:
- build/fedora/36 - build/fedora/36
upload/fedora/36: upload/fedora/36:
<<: *upload <<: *upload
dependencies: dependencies:
- build/fedora/36 - build/fedora/36
build/fedora/35: build/fedora/35:
<<: *build <<: *build
@ -92,13 +98,16 @@ test/fedora/35:
variables: variables:
DOCKER_IMAGE: fedora/35 DOCKER_IMAGE: fedora/35
dependencies: dependencies:
- build/fedora/35 - build/fedora/35
upload/fedora/35: upload/fedora/35:
<<: *upload <<: *upload
dependencies: dependencies:
- build/fedora/35 - build/fedora/35
###################################
# openSUSE
###################################
build/opensuse/15.4: build/opensuse/15.4:
<<: *build <<: *build
variables: variables:
@ -109,12 +118,12 @@ test/opensuse/15.4:
variables: variables:
DOCKER_IMAGE: opensuse/15.4 DOCKER_IMAGE: opensuse/15.4
dependencies: dependencies:
- build/opensuse/15.4 - build/opensuse/15.4
upload/opensuse/15.4: upload/openSUSE/15.4:
<<: *upload <<: *upload
dependencies: dependencies:
- build/opensuse/15.4 - build/opensuse/15.4
build/opensuse/15.3: build/opensuse/15.3:
<<: *build <<: *build
@ -126,9 +135,9 @@ test/opensuse/15.3:
variables: variables:
DOCKER_IMAGE: opensuse/15.3 DOCKER_IMAGE: opensuse/15.3
dependencies: dependencies:
- build/opensuse/15.3 - build/opensuse/15.3
upload/opensuse/15.3: upload/openSUSE/15.3:
<<: *upload <<: *upload
dependencies: dependencies:
- build/opensuse/15.3 - build/opensuse/15.3