ci: remove pkg:epel-7 pkg:fedora-29 jobs

These jobs started to suddenly fail inexplicably. They also
require privileged mode and are a mess in general

Build and packaging for these distros is handled by nightly OBS builds
nowadays, so let's remove these.

Perhaps in the future, it might make sense ot bring back some sensible
CentOS 7 build (without the packaging part) to make sure we keep
compatibility with older GnuTLS on every commit / MR, instead of
nightly.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10e080a25beade2b529f214562030eeeb5d01da5..9f6f4b1d7574d8239f15c1be488c051e560aaf42 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -234,48 +234,6 @@ lint:tidy:
   script:
     - ninja -C build_ci* tidy
 
-.pkgbuild: &pkgbuild
-  stage: test
-  except:
-    refs:
-      - master
-    variables:
-      - $SKIP_CI == "1"
-  image: $CI_REGISTRY/knot/knot-resolver/ci/fedora
-  only:  # trigger job only in repos under our control
-    - branches@knot/knot-resolver
-    - branches@knot/knot-resolver-security
-  dependencies:
-    - archive
-  artifacts:
-    when: always
-    paths:
-      - epel-7-x86_64/
-      - fedora-29-x86_64/
-      - "*.src.rpm"
-  tags:
-    - privileged  # mock requires additional capabilities (e.g. mount)
-  retry:
-    max: 1
-    when:
-      - script_failure
-
-pkg:epel-7:
-  <<: *pkgbuild
-  script:
-    - ./scripts/make-srpm.sh
-    - mock --no-clean --dnf --old-chroot -r epel-7-x86_64 --rebuild *.src.rpm || (cat /var/lib/mock/epel-7-x86_64/result/build.log; false)
-  after_script:
-    - mv /var/lib/mock/epel-7-x86_64/result epel-7-x86_64
-
-pkg:fedora-29:
-  <<: *pkgbuild
-  script:
-    - ./scripts/make-srpm.sh
-    - mock --no-clean --old-chroot -r fedora-29-x86_64 --rebuild *.src.rpm || (cat /var/lib/mock/fedora-29-x86_64/result/build.log; false)
-  after_script:
-    - mv /var/lib/mock/fedora-29-x86_64/result fedora-29-x86_64
-
 respdiff:basic:
   <<: *test
   dependencies:

diff --git a/ci/README.md b/ci/README.md
index 92223fe29c842fd75f19b4b64cdb173b49539238..e67e21f23cfa1addf94c135f18630d5370991888 100644 (file)
--- a/ci/README.md
+++ b/ci/README.md
@@ -11,13 +11,6 @@ $ docker login registry.labs.nic.cz
 $ docker push registry.labs.nic.cz/knot/knot-resolver/ci/debian-buster:knot-$KNOT_BRANCH
 ```
 
-* fedora
-
-```
-$ docker build --no-cache -t registry.labs.nic.cz/knot/knot-resolver/ci/fedora fedora
-$ docker push registry.labs.nic.cz/knot/knot-resolver/ci/fedora
-```
-
 * turris
 
 ```

diff --git a/ci/fedora/Dockerfile b/ci/fedora/Dockerfile
deleted file mode 100644 (file)
index 0997a1e..0000000
--- a/ci/fedora/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM fedora:29
-
-WORKDIR "/tmp"
-CMD ["/bin/bash"]
-
-RUN dnf install -y mock rpkg git
-
-# for scripts/make-distrofiles.sh
-RUN dnf install -y dpkg-dev perl-Digest-*
-
-# add OBS repo with Knot DNS to mock
-RUN curl -Lo obs-epel7.repo 'https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-testing/CentOS_7_EPEL/home:CZ-NIC:knot-resolver-testing.repo'
-RUN sed -i -e "/^config_opts\[.yum.conf.]/r obs-epel7.repo" /etc/mock/epel-7-x86_64.cfg
-RUN curl -Lo obs-fedora.repo 'https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-testing/Fedora_29/home:CZ-NIC:knot-resolver-testing.repo'
-RUN sed -i -e "/^config_opts\[.yum.conf.]/r obs-fedora.repo" /etc/mock/fedora-29-x86_64.cfg
-
-# cache packages in mock to speed up CI tests
-# This would require privileged build: https://github.com/moby/moby/issues/1916
-# RUN dnf download --source knot-resolver
-# RUN mock --no-clean --dnf --old-chroot -r epel-7-x86_64 --rebuild knot-resolver-*.src.rpm
-# RUN mock --no-clean --old-chroot -r fedora-29-x86_64 --rebuild knot-resolver-*.src.rpm
-# RUN rm *.src.rpm