From a893925b3ae4f7652288b17000d77a008494b64d Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Fri, 12 Jul 2019 15:47:58 +0200 Subject: [PATCH] ci: Update build matrix --- .gitlab-ci.yml | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c5e7683..c948585 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,11 +42,11 @@ variables: script: - find build/ - icinga-build-upload-aptly - # TODO: enable when switching to GitLab CI only: - nonexisting_branch - # - tags + # TODO: enable when switching to GitLab CI # - master + # - tags ################################### # EPEL @@ -159,23 +159,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 ################################### @@ -195,20 +178,3 @@ upload/openSUSE/15.0: <<: *upload dependencies: - 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