[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible fedora rpms: fix mock setup

Sun Dec 13 16:52:26 UTC 2015

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 5963b9f94fe759eb735da7dae73d6b9be09c6ed9
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Dec 13 17:51:55 2015 +0100

    reproducible fedora rpms: fix mock setup
---
 TODO                                               |  3 +++
 bin/reproducible_setup_mock.sh                     | 10 ++++++++
 hosts/jenkins/etc/mock/fedora-23-x86_64.cfg        | 29 +++-------------------
 .../etc/mock/fedora-23-x86_64.cfg                  | 29 +++-------------------
 4 files changed, 21 insertions(+), 50 deletions(-)

diff --git a/TODO b/TODO
index cc83595..67cdadd 100644
--- a/TODO
+++ b/TODO
@@ -281,6 +281,9 @@ This is about Debian, below are more todo entries for other projects…
 
 ==== reproducible Fedora
 
+* setup script:
+** mock --clean just uninstalls the chroot but it'll still be rebuilt next time using cache.  you can delete the caches from /var/cache/mock/ or touch the mock config
+** is /etc/yum/repos.d/fedora.repo really needed?
 * build script
 ** cleanup mock cache between two builds. --scrub=all might be too much, but whats sensible (or is it --scrub=all?)?
 ** how to allow more than one mock builder per node? using schroots?
diff --git a/bin/reproducible_setup_mock.sh b/bin/reproducible_setup_mock.sh
index 16f7bde..a98abc7 100755
--- a/bin/reproducible_setup_mock.sh
+++ b/bin/reproducible_setup_mock.sh
@@ -23,9 +23,19 @@ dpkg -l mock
 id
 echo "$(date -u) - cleaning yum."
 yum -v clean all
+yum -v check
+yum -v repolist all
 echo "$(date -u) - starting to cleanly configure mock for $RELEASE on $ARCH."
+echo "$(date -u) - mock --clean"
 mock -r $RELEASE-$ARCH --resultdir=. -v --clean
+echo "$(date -u) - mock --scrub=all"
 mock -r $RELEASE-$ARCH --resultdir=. -v --scrub=all
 tree /var/cache/mock/
+echo "$(date -u) - mock --init"
 mock -r $RELEASE-$ARCH --resultdir=. -v --init
 echo "$(date -u) - mock configured for $RELEASE on $ARCH."
+echo "$(date -u) - mock --install rpm-build"
+mock -r $RELEASE-$ARCH --resultdir=. -v --install rpm-build
+echo "$(date -u) - mock --update"
+mock -r $RELEASE-$ARCH --resultdir=. -v --update
+
diff --git a/hosts/jenkins/etc/mock/fedora-23-x86_64.cfg b/hosts/jenkins/etc/mock/fedora-23-x86_64.cfg
index aa78fa5..d384ec9 100644
--- a/hosts/jenkins/etc/mock/fedora-23-x86_64.cfg
+++ b/hosts/jenkins/etc/mock/fedora-23-x86_64.cfg
@@ -25,41 +25,20 @@ metadata_expire=0
 
 [fedora]
 name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/releases/23/Everything/x86_64/os/
 failovermethod=priority
 #gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-23-primary
 #gpgcheck=1
 
 [updates]
 name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/updates/23/x86_64/
 failovermethod=priority
 #gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-23-primary
 #gpgcheck=1
 
-[updates-testing]
-name=updates-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
-failovermethod=priority
-enabled=0
-
-[fedora-debuginfo]
-name=fedora-debuginfo
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-23&arch=$basearch
-failovermethod=priority
-enabled=0
-
-[updates-debuginfo]
-name=updates-debuginfo
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
-failovermethod=priority
-enabled=0
-
-[updates-testing-debuginfo]
-name=updates-testing-debuginfo
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
-failovermethod=priority
-enabled=0
 
 [reproducible-builds]
 name=reproducible-builds
diff --git a/hosts/profitbricks-build3-amd64/etc/mock/fedora-23-x86_64.cfg b/hosts/profitbricks-build3-amd64/etc/mock/fedora-23-x86_64.cfg
index aa78fa5..d384ec9 100644
--- a/hosts/profitbricks-build3-amd64/etc/mock/fedora-23-x86_64.cfg
+++ b/hosts/profitbricks-build3-amd64/etc/mock/fedora-23-x86_64.cfg
@@ -25,41 +25,20 @@ metadata_expire=0
 
 [fedora]
 name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/releases/23/Everything/x86_64/os/
 failovermethod=priority
 #gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-23-primary
 #gpgcheck=1
 
 [updates]
 name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/updates/23/x86_64/
 failovermethod=priority
 #gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-23-primary
 #gpgcheck=1
 
-[updates-testing]
-name=updates-testing
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
-failovermethod=priority
-enabled=0
-
-[fedora-debuginfo]
-name=fedora-debuginfo
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-23&arch=$basearch
-failovermethod=priority
-enabled=0
-
-[updates-debuginfo]
-name=updates-debuginfo
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
-failovermethod=priority
-enabled=0
-
-[updates-testing-debuginfo]
-name=updates-testing-debuginfo
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
-failovermethod=priority
-enabled=0
 
 [reproducible-builds]
 name=reproducible-builds

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git

