From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 3 Sep 2018 14:58:54 +0000 (+0200)
Subject: ci: docker/fedora update to F29
X-Git-Tag: v3.1.0~22^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67d2a49fdb2b3d8545b3775cd67774eb28b20133;p=thirdparty%2Fknot-resolver.git

ci: docker/fedora update to F29
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01a9c2db5..543a5caa8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -338,7 +338,7 @@ respdiff:iter:udp:linux:amd64:
     - amd64
 
 
-distro:fedora-27:
+distro:fedora-29:
   stage: test
   except:
     - master@knot/knot-resolver
@@ -348,19 +348,14 @@ distro:fedora-27:
   dependencies:
     - srpm
   script:
-    # TODO remove once Knot DNS 2.7.1 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/a22685bd0c737be97af11351c099fc2d/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/ed349a36e8b6aca6fc5fc8fd6eef699a/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/4960c36e94053a8aaf0f237bb5310b53/knot-libs-2.7.1-1.1.x86_64.rpm
-    - mock --init --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 fedora-27-x86_64
-    - mock --no-clean --old-chroot -r fedora-27-x86_64 --rebuild *.src.rpm
+    - 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)
   after_script:
-    - mv /var/lib/mock/fedora-27-x86_64/result fedora-27-x86_64
+    - mv /var/lib/mock/fedora-29-x86_64/result fedora-27-x86_64
   artifacts:
     when: always
     expire_in: '1 week'
     paths:
-      - fedora-27-x86_64/
+      - fedora-29-x86_64/
   tags:
     - privileged  # mock requires additional capabilities (e.g. mount)
 
diff --git a/ci/fedora/Dockerfile b/ci/fedora/Dockerfile
index a5d2d3d61..f160cfb1b 100644
--- a/ci/fedora/Dockerfile
+++ b/ci/fedora/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:27
+FROM fedora:29
 
 WORKDIR "/tmp"
 CMD ["/bin/bash"]