Commit 8cef3f97 authored by Markus Frosch's avatar Markus Frosch
Browse files

ci: Update build matrix

parent 574c3708
...@@ -42,13 +42,46 @@ variables: ...@@ -42,13 +42,46 @@ variables:
script: script:
- find build/ - find build/
- icinga-build-upload-aptly - icinga-build-upload-aptly
only:
- non_existing_branch
# TODO: enable when switching to GitLab CI # TODO: enable when switching to GitLab CI
#only: # - master
# - tags # - tags
################################### ###################################
# Debian # Debian
################################### ###################################
build/debian/buster:
<<: *build
variables:
DOCKER_IMAGE: debian/buster
test/debian/buster:
<<: *test
variables:
DOCKER_IMAGE: debian/buster
dependencies:
- build/debian/buster
build/debian/buster:x86:
<<: *build
variables:
DOCKER_IMAGE: debian/buster:x86
test/debian/buster:x86:
<<: *test
variables:
DOCKER_IMAGE: debian/buster:x86
dependencies:
- build/debian/buster:x86
- build/debian/buster
upload/debian/buster:
<<: *upload
dependencies:
- build/debian/buster:x86
- build/debian/buster
build/debian/stretch: build/debian/stretch:
<<: *build <<: *build
variables: variables:
...@@ -80,40 +113,42 @@ upload/debian/stretch: ...@@ -80,40 +113,42 @@ upload/debian/stretch:
- build/debian/stretch:x86 - build/debian/stretch:x86
- build/debian/stretch - build/debian/stretch
build/debian/jessie: ###################################
# Ubuntu
###################################
build/ubuntu/disco:
<<: *build <<: *build
variables: variables:
DOCKER_IMAGE: debian/jessie ICINGA_BUILD_DEB_FLAVOR: stretch
DOCKER_IMAGE: ubuntu/disco
test/debian/jessie: test/ubuntu/disco:
<<: *test <<: *test
variables: variables:
DOCKER_IMAGE: debian/jessie DOCKER_IMAGE: ubuntu/disco
dependencies: dependencies:
- build/debian/jessie - build/ubuntu/disco
build/debian/jessie:x86: build/ubuntu/disco:x86:
<<: *build <<: *build
variables: variables:
DOCKER_IMAGE: debian/jessie:x86 ICINGA_BUILD_DEB_FLAVOR: stretch
DOCKER_IMAGE: ubuntu/disco:x86
test/debian/jessie:x86: test/ubuntu/disco:x86:
<<: *test <<: *test
variables: variables:
DOCKER_IMAGE: debian/jessie:x86 DOCKER_IMAGE: ubuntu/disco:x86
dependencies: dependencies:
- build/debian/jessie:x86 - build/ubuntu/disco:x86
- build/debian/jessie - build/ubuntu/disco
upload/debian/jessie: upload/ubuntu/disco:
<<: *upload <<: *upload
dependencies: dependencies:
- build/debian/jessie:x86 - build/ubuntu/disco:x86
- build/debian/jessie - build/ubuntu/disco
###################################
# Ubuntu
###################################
build/ubuntu/bionic: build/ubuntu/bionic:
<<: *build <<: *build
variables: variables:
...@@ -179,34 +214,3 @@ upload/ubuntu/xenial: ...@@ -179,34 +214,3 @@ upload/ubuntu/xenial:
dependencies: dependencies:
- build/ubuntu/xenial:x86 - build/ubuntu/xenial:x86
- build/ubuntu/xenial - build/ubuntu/xenial
build/ubuntu/trusty:
<<: *build
variables:
DOCKER_IMAGE: ubuntu/trusty
test/ubuntu/trusty:
<<: *test
variables:
DOCKER_IMAGE: ubuntu/trusty
dependencies:
- build/ubuntu/trusty
build/ubuntu/trusty:x86:
<<: *build
variables:
DOCKER_IMAGE: ubuntu/trusty:x86
test/ubuntu/trusty:x86:
<<: *test
variables:
DOCKER_IMAGE: ubuntu/trusty:x86
dependencies:
- build/ubuntu/trusty:x86
- build/ubuntu/trusty
upload/ubuntu/trusty:
<<: *upload
dependencies:
- build/ubuntu/trusty:x86
- build/ubuntu/trusty
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment