diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb5700e4541c04ead49f883252a1f72dbec938c1..01f10b1a8ac1ab59c267087df98b1a7f86f89e90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,9 +22,6 @@ before_script: - make -C ${CI_JOB_NAME} - '[ "$CI_COMMIT_REF_NAME" != master ] || make -C ${CI_JOB_NAME} push' -'27': - <<: *build_job - '28': <<: *build_job diff --git a/27/Dockerfile b/27/Dockerfile deleted file mode 100644 index bc3eff4bb2416ba0e9b52222fbf64f413a2115a4..0000000000000000000000000000000000000000 --- a/27/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM fedora:27 - -RUN dnf update -y - -# 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/27/Makefile b/27/Makefile deleted file mode 100644 index f451fe153997996b75db9be5b1b9b967fad97fc4..0000000000000000000000000000000000000000 --- a/27/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -VARIANT := x86_64 -include ../image.mk diff --git a/Makefile b/Makefile index 2bc24fe09f8f8601e934702c9528e17f88acfece..99df84dec8e18402db62cf3113ccae8f08960d92 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,7 @@ all: - $(MAKE) -C 27 $(MAKE) -C 28 $(MAKE) -C 29 push: - $(MAKE) -C 27 push $(MAKE) -C 28 push $(MAKE) -C 29 push