ci: docker/fedora - add OBS to EPEL7 mock

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 543a5caa84c92c7c641266d6b05401693d3603b0..3060462241a97b9a9bc9d5d1804b4ed3558dfb4c 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -348,9 +348,9 @@ distro:fedora-29:
   dependencies:
     - srpm
   script:
-    - mock --no-clean --old-chroot -r fedora-29-x86_64 obs.repo /etc/yum/repos.d/obs.repo --rebuild *.src.rpm || (cat /var/lib/mock/fedora-29-x86_64/result/build.log; false)
+    - 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-27-x86_64
+    - mv /var/lib/mock/fedora-29-x86_64/result fedora-29-x86_64
   artifacts:
     when: always
     expire_in: '1 week'
@@ -369,11 +369,6 @@ distro:epel-7:
   dependencies:
     - srpm
   script:
-    # TODO remove once Knot DNS 2.7 packages are available from official distro repos
-    - curl -Lo knot-devel-2.7.1-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/780d01725c2d95f63251d32b5c81d571/knot-devel-2.7.1-1.1.x86_64.rpm
-    - curl -Lo knot-2.7.1-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/6abdad1de5e76b413f3089bce45efbed/knot-2.7.1-1.1.x86_64.rpm
-    - curl -Lo knot-libs-2.7.1-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/e80b25f25e379472530ea5b2ea00fac1/knot-libs-2.7.1-1.1.x86_64.rpm
-    - mock --init --dnf --old-chroot -i knot-devel-2.7.1-1.1.x86_64.rpm -i  knot-2.7.1-1.1.x86_64.rpm -i knot-libs-2.7.1-1.1.x86_64.rpm -r epel-7-x86_64
     - 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

diff --git a/ci/fedora/Dockerfile b/ci/fedora/Dockerfile
index f160cfb1bf6ed5b74c2b81d1a32a82ac3c279293..a7392961cc7740f1218a40cb143d732c2c1b26a4 100644 (file)
--- a/ci/fedora/Dockerfile
+++ b/ci/fedora/Dockerfile
@@ -7,3 +7,14 @@ 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-latest/CentOS_7_EPEL/home:CZ-NIC:knot-resolver-latest.repo'
+RUN sed -i -e "/^config_opts\[.yum.conf.]/r obs-epel7.repo" /etc/mock/epel-7-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