From 92161eebac1756f9c7adef240b7495fa90f2ae76 Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: May 25 2018 10:36:18 +0000 Subject: Omit making network requests with rpmbuild When building documentation, one of Sphinx extensions [1] transforms plain text references to issues to links to appropriate issue tracker. It also requests issue title and state (open/closed) from the tracker to decorate these links further. Single request is made for each issue reference in documentation. This can be very slow and unreliable. This patch disables generating such links when building RPM. Currently it only means that the documentation installed from RPM would contain plain text issue numbers instead of links. Online documentation will still contain links to issues. See also 911bb60fce98bfde19d3959f70e5be0a3c8a6b8d. [1] https://github.com/ignatenkobrain/sphinxcontrib-issuetracker Fixes #128 --- diff --git a/Jenkinsfile b/Jenkinsfile index 52606b1..52783a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -80,7 +80,7 @@ node('fedora') { sh """ mkdir -p mock-result/el7 flock /etc/mock/epel-7-x86_64.cfg \ - /usr/bin/mock -v --enable-network --resultdir=mock-result/el7 -r epel-7-x86_64 --clean --rebuild rpmbuild-output/*.src.rpm + /usr/bin/mock -v --resultdir=mock-result/el7 -r epel-7-x86_64 --clean --rebuild rpmbuild-output/*.src.rpm """ archiveArtifacts artifacts: 'mock-result/el7/**' }, @@ -88,7 +88,7 @@ node('fedora') { sh """ mkdir -p mock-result/f27 flock /etc/mock/fedora-27-x86_64.cfg \ - /usr/bin/mock -v --enable-network --resultdir=mock-result/f27 -r fedora-27-x86_64 --clean --rebuild rpmbuild-output/*.src.rpm + /usr/bin/mock -v --resultdir=mock-result/f27 -r fedora-27-x86_64 --clean --rebuild rpmbuild-output/*.src.rpm """ archiveArtifacts artifacts: 'mock-result/f27/**' }, @@ -96,7 +96,7 @@ node('fedora') { sh """ mkdir -p mock-result/f28 flock /etc/mock/fedora-28-x86_64.cfg \ - /usr/bin/mock -v --enable-network --resultdir=mock-result/f28 -r fedora-28-x86_64 --clean --rebuild rpmbuild-output/*.src.rpm + /usr/bin/mock -v --resultdir=mock-result/f28 -r fedora-28-x86_64 --clean --rebuild rpmbuild-output/*.src.rpm """ archiveArtifacts artifacts: 'mock-result/f28/**' }, diff --git a/waiverdb.spec b/waiverdb.spec index 62fb3ad..4b68970 100644 --- a/waiverdb.spec +++ b/waiverdb.spec @@ -110,7 +110,7 @@ sed -i 's/\.stg\.fedoraproject\.org/.fedoraproject.org/g' conf/client.conf.examp %build %if 0%{?fedora} || 0%{?rhel} > 7 %py3_build -make -C docs SPHINXOPTS= html man text +make -C docs SPHINXOPTS="-D issuetracker_plaintext_issues=0" html man text %else %py2_build %endif