diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9afb7d7d935d713044dbc2900c0cf3593009ae0c..a4c362fd124e36f39f7689c2b20a16eec949e614 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' -'32': - <<: *build_job - '33': <<: *build_job diff --git a/32/Dockerfile b/32/Dockerfile deleted file mode 100644 index 7d93ace64f79a697be92e0cba9c67c341d800371..0000000000000000000000000000000000000000 --- a/32/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM fedora:32 - -RUN dnf update -y --setopt=install_weak_deps=False - -RUN dnf install -y --allowerasing \ - 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 wget -O /etc/yum.repos.d/ICINGA-release.repo \ - https://packages.icinga.com/fedora/ICINGA-release.repo - -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/32/Makefile b/32/Makefile deleted file mode 100644 index f451fe153997996b75db9be5b1b9b967fad97fc4..0000000000000000000000000000000000000000 --- a/32/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -VARIANT := x86_64 -include ../image.mk diff --git a/Makefile b/Makefile index 8356c41f4e84d3de9a703ff5ad3c5cf49bc5aaf3..9954265b945c6cdc2cc36f3fcf487d06bcf3d244 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,5 @@ all: - $(MAKE) -C 32 $(MAKE) -C 33 push: - $(MAKE) -C 32 push $(MAKE) -C 33 push