From 440f7fdc054e785f4f9024f1885050d07b9a1793 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Wed, 2 Dec 2020 13:03:42 +0100
Subject: [PATCH] Drop v15.0
---
.gitlab-ci.yml | 3 ---
15.0/Dockerfile | 36 ------------------------------------
15.0/Makefile | 2 --
Makefile | 2 --
4 files changed, 43 deletions(-)
delete mode 100644 15.0/Dockerfile
delete mode 100644 15.0/Makefile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 569e356..1a39fc8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,8 +18,5 @@ before_script:
- make -C ${CI_JOB_NAME}
- '[ "$CI_COMMIT_REF_NAME" != master ] || make -C ${CI_JOB_NAME} push'
-'15.0':
- <<: *build_job
-
'15.1':
<<: *build_job
diff --git a/15.0/Dockerfile b/15.0/Dockerfile
deleted file mode 100644
index f1641de..0000000
--- a/15.0/Dockerfile
+++ /dev/null
@@ -1,36 +0,0 @@
-FROM opensuse/leap:15.0
-
-RUN zypper refresh -f \
- && zypper update -y \
- && zypper clean
-
-RUN zypper --non-interactive install --no-recommends \
- sudo wget curl which tar expect git \
- make patch rpm-build rpmlint \
- && zypper clean
-
-RUN zypper --non-interactive install --no-recommends \
- cmake libopenssl-devel ccache \
- && zypper clean
-
-RUN OBS_DIST=openSUSE_Leap_15.0 \
- && zypper --non-interactive addrepo --refresh https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/languages:/go/"${OBS_DIST}"/home:lazyfrosch:devel:languages:go.repo \
- && zypper --non-interactive addrepo --refresh https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/tools/"${OBS_DIST}"/home:lazyfrosch:devel:tools.repo \
- && zypper --gpg-auto-import-keys --non-interactive install spectool createrepo \
- && zypper clean -a
-
-RUN rpm --import https://packages.icinga.com/icinga.key \
- && zypper --non-interactive addrepo --refresh https://packages.icinga.com/openSUSE/ICINGA-release.repo \
- && zypper --non-interactive refresh \
- && zypper clean -a
-
-RUN groupadd -g 1000 build \
- && useradd -u 1000 -g 1000 -m build \
- && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
- && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
- && chown build.build /usr/local/bin
-
-USER build
-RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
-ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
-CMD ["icinga-build-package"]
diff --git a/15.0/Makefile b/15.0/Makefile
deleted file mode 100644
index f451fe1..0000000
--- a/15.0/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-VARIANT := x86_64
-include ../image.mk
diff --git a/Makefile b/Makefile
index db0f3ef..816b3e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
all:
- $(MAKE) -C 15.0
$(MAKE) -C 15.1
push:
- $(MAKE) -C 15.0 push
$(MAKE) -C 15.1 push
--
GitLab