From 7bbf4697eee7e2d9c357043406b4c5fa11d0dc5c Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Sun, 1 Sep 2019 11:06:46 +0200
Subject: [PATCH] Remove 28
---
.gitlab-ci.yml | 3 ---
28/Dockerfile | 25 -------------------------
28/Makefile | 2 --
Makefile | 2 --
4 files changed, 32 deletions(-)
delete mode 100644 28/Dockerfile
delete mode 100644 28/Makefile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37c4888..32d85a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,9 +18,6 @@ before_script:
- make -C ${CI_JOB_NAME}
- '[ "$CI_COMMIT_REF_NAME" != master ] || make -C ${CI_JOB_NAME} push'
-'28':
- <<: *build_job
-
'29':
<<: *build_job
diff --git a/28/Dockerfile b/28/Dockerfile
deleted file mode 100644
index 6e0c1ce..0000000
--- a/28/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM fedora:28
-
-RUN dnf update -y --setopt=install_weak_deps=False
-
-# TODO: Remove this once the build deps for boost have been cleaned up...
-RUN echo '%build_icinga_org 1' >/etc/rpm/macros.icinga_build
-
-RUN dnf install -y \
- sudo wget curl which tar expect git \
- patch rpm-build redhat-rpm-config rpmlint \
- patch ccache make util-linux \
- dnf-utils rpmdevtools createrepo \
- && dnf clean all
-
-RUN groupadd -g 1000 jenkins \
- && useradd -u 1000 -g 1000 -m jenkins \
- && echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
- && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
-
-RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \
- https://packages.icinga.com/fedora/ICINGA-release.repo
-
-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/28/Makefile b/28/Makefile
deleted file mode 100644
index f451fe1..0000000
--- a/28/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-VARIANT := x86_64
-include ../image.mk
diff --git a/Makefile b/Makefile
index fb2cdba..88c9ce5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,7 @@
all:
- $(MAKE) -C 28
$(MAKE) -C 29
$(MAKE) -C 30
push:
- $(MAKE) -C 28 push
$(MAKE) -C 29 push
$(MAKE) -C 30 push
--
GitLab