diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8738f695aae8e5a50cb53a3c5963d66db1fade41..7fcdc5a966ab3c0c11dfe28cf4243b45c3360ff8 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.1': - <<: *build_job - '15.2': <<: *build_job diff --git a/15.1/Dockerfile b/15.1/Dockerfile deleted file mode 100644 index 0d3527f518b73c3b1bd004f887f9994c1f7e6843..0000000000000000000000000000000000000000 --- a/15.1/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM opensuse/leap:15.1 - -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.1 \ - && 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.1/Makefile b/15.1/Makefile deleted file mode 100644 index f451fe153997996b75db9be5b1b9b967fad97fc4..0000000000000000000000000000000000000000 --- a/15.1/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -VARIANT := x86_64 -include ../image.mk diff --git a/Makefile b/Makefile index aaaa640a7fd6868644186f816f6a5b250082a141..55caed7bce668c9898dbc98dc9d1c86dd2b070d8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,5 @@ all: - $(MAKE) -C 15.1 $(MAKE) -C 15.2 push: - $(MAKE) -C 15.1 push $(MAKE) -C 15.2 push