From 003d42d8ec592e2d66ef4aac9b11d5aba82413a8 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" <alexander.klimov@netways.de> Date: Fri, 23 Aug 2019 17:21:51 +0200 Subject: [PATCH] WIP --- .gitlab-ci.yml | 130 +------------------------------------------------ 1 file changed, 1 insertion(+), 129 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb4e2f7..4bdb71c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: variables: DOCKER_IMAGE_BASE: registry.icinga.com/build-docker ICINGA_BUILD_TYPE: snapshot - #ICINGA_BUILD_UPSTREAM_BRANCH: + ICINGA_BUILD_UPSTREAM_BRANCH: bugfix/ddos-reconnect-7444 .build: &build stage: build @@ -49,23 +49,6 @@ variables: ################################### # EPEL ################################### -build/rhel/8: - <<: *build - variables: - DOCKER_IMAGE: rhel/8 - -test/rhel/8: - <<: *test - variables: - DOCKER_IMAGE: rhel/8 - dependencies: - - build/rhel/8 - -upload/epel/8: - <<: *upload - dependencies: - - build/rhel/8 - build/centos/7: <<: *build variables: @@ -82,114 +65,3 @@ upload/epel/7: <<: *upload dependencies: - build/centos/7 - -build/centos/6: - <<: *build - variables: - DOCKER_IMAGE: centos/6 - -test/centos/6: - <<: *test - variables: - DOCKER_IMAGE: centos/6 - dependencies: - - build/centos/6 - -upload/epel/6: - <<: *upload - dependencies: - - build/centos/6 - -################################### -# Fedora -################################### -build/fedora/30: - <<: *build - variables: - DOCKER_IMAGE: fedora/30 - -test/fedora/30: - <<: *test - variables: - DOCKER_IMAGE: fedora/30 - dependencies: - - build/fedora/30 - -upload/fedora/30: - <<: *upload - 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 - -################################### -# SLES -################################### -build/sles/15.0: - <<: *build - variables: - DOCKER_IMAGE: sles/15.0 - -test/sles/15.0: - <<: *test - variables: - DOCKER_IMAGE: sles/15.0 - dependencies: - - build/sles/15.0 - -upload/SUSE/15.0: - <<: *upload - dependencies: - - build/sles/15.0 - -build/sles/12.4: - <<: *build - variables: - DOCKER_IMAGE: sles/12.4 - -test/sles/12.4: - <<: *test - variables: - DOCKER_IMAGE: sles/12.4 - dependencies: - - build/sles/12.4 - -upload/SUSE/12.4: - <<: *upload - dependencies: - - build/sles/12.4 - -################################### -# openSUSE -################################### -build/opensuse/15.0: - <<: *build - variables: - DOCKER_IMAGE: opensuse/15.0 - -test/opensuse/15.0: - <<: *test - variables: - DOCKER_IMAGE: opensuse/15.0 - dependencies: - - build/opensuse/15.0 - -upload/openSUSE/15.0: - <<: *upload - dependencies: - - build/opensuse/15.0 -- GitLab