diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9637a73874919221d02ab2de2235c34c99ddbb14..0cecc25485609966a12dc73fdf900c366d526e18 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' -'42.3': - <<: *build_job - '15.0': <<: *build_job diff --git a/42.3/Dockerfile b/42.3/Dockerfile deleted file mode 100644 index 9e78f518d34d86d3e40981e88cac5b9dda716785..0000000000000000000000000000000000000000 --- a/42.3/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM opensuse/leap:42.3 - -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_42.3 \ - && 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/42.3/Makefile b/42.3/Makefile deleted file mode 100644 index f451fe153997996b75db9be5b1b9b967fad97fc4..0000000000000000000000000000000000000000 --- a/42.3/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -VARIANT := x86_64 -include ../image.mk diff --git a/Makefile b/Makefile index 0905417c3c30bcd2d12d53be680f69930608910e..32d27a30477f2ab25c34e128786c300b1d7abb20 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,9 @@ all: - $(MAKE) -C 42.3 $(MAKE) -C 15.0 $(MAKE) -C 15.1 $(MAKE) -C 15.2 push: - $(MAKE) -C 42.3 push $(MAKE) -C 15.0 push $(MAKE) -C 15.1 push $(MAKE) -C 15.2 push