[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible fedora rpms: configure yum correctly inside mock
Holger Levsen
holger at moszumanska.debian.org
Thu Dec 17 16:19:40 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 0b3234e70b9ef0094b56b2fed9fe2298e916ca05
Author: Holger Levsen <holger at layer-acht.org>
Date: Thu Dec 17 17:18:58 2015 +0100
reproducible fedora rpms: configure yum correctly inside mock
---
TODO | 1 +
bin/reproducible_build_rpm.sh | 2 +-
bin/reproducible_setup_mock.sh | 12 ++++++------
hosts/jenkins/etc/mock/fedora-23-x86_64.cfg | 4 ++--
hosts/jenkins/etc/yum/repos.d/fedora.repo | 4 ++--
.../profitbricks-build3-amd64/etc/mock/fedora-23-x86_64.cfg | 4 ++--
hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora.repo | 4 ++--
7 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/TODO b/TODO
index a8e1ad8..fd400db 100644
--- a/TODO
+++ b/TODO
@@ -283,6 +283,7 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma
==== reproducible Fedora
+* dont hardcode 23 in reproducible_setup_mock.sh
* use mock in parallel with --uniqeext
** task: needs to be passed via ssh too (and we want ssh to do remote builds like debian from one master node)
* setup script:
diff --git a/bin/reproducible_build_rpm.sh b/bin/reproducible_build_rpm.sh
index b754fb7..8256c27 100755
--- a/bin/reproducible_build_rpm.sh
+++ b/bin/reproducible_build_rpm.sh
@@ -43,7 +43,7 @@ update_mock() {
echo "$(date -u ) - updating mock for $RELEASE ($ARCH) on $HOSTNAME now..."
mock -r $RELEASE-$ARCH --resultdir=. --cleanup-after -v --update 2>&1
echo "$(date -u ) - mock updated."
- yum -v check-update
+ yum -v --releasever=23 check-update # FIXME: dont hard-code releasever here. rawhide?
echo "$(date -u ) - yum updated."
touch $STAMP
else
diff --git a/bin/reproducible_setup_mock.sh b/bin/reproducible_setup_mock.sh
index 7c48640..072a7c4 100755
--- a/bin/reproducible_setup_mock.sh
+++ b/bin/reproducible_setup_mock.sh
@@ -25,9 +25,9 @@ dpkg -l mock
id
echo "$(date -u) - cleaning yum."
rm ~/.rpmdb -rf
-yum -v clean all
-yum -v check
-yum -v repolist all
+yum -v --releasever=23 clean all
+yum -v --releasever=23 check
+yum -v --releasever=23 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
@@ -37,10 +37,10 @@ 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"
+echo "$(date -u) - mock --install rpm-build yum"
mock -r $RELEASE-$ARCH --resultdir=. -v --install rpm-build yum
echo "$(date -u) - mock --update"
mock -r $RELEASE-$ARCH --resultdir=. -v --update
-echo "$(date -u) - yum makecache"
-mock -r $RELEASE-$ARCH --resultdir=. -v --chroot dnf makecache
+#echo "$(date -u) - dnf makecache"
+#mock -r $RELEASE-$ARCH --resultdir=. -v --chroot -- dnf --releasever=23 makecache
diff --git a/hosts/jenkins/etc/mock/fedora-23-x86_64.cfg b/hosts/jenkins/etc/mock/fedora-23-x86_64.cfg
index 0da1e2a..323381b 100644
--- a/hosts/jenkins/etc/mock/fedora-23-x86_64.cfg
+++ b/hosts/jenkins/etc/mock/fedora-23-x86_64.cfg
@@ -27,16 +27,16 @@ metadata_expire=0
[fedora]
name=fedora
-#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/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-23&arch=$basearch
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
baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/updates/23/x86_64/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f23&arch=$basearch
failovermethod=priority
#gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-23-primary
#gpgcheck=1
diff --git a/hosts/jenkins/etc/yum/repos.d/fedora.repo b/hosts/jenkins/etc/yum/repos.d/fedora.repo
index a44b8eb..4c5c6c1 100644
--- a/hosts/jenkins/etc/yum/repos.d/fedora.repo
+++ b/hosts/jenkins/etc/yum/repos.d/fedora.repo
@@ -1,6 +1,6 @@
[fedora]
name=fedora
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-23&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
@@ -8,7 +8,7 @@ failovermethod=priority
[updates]
name=updates
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f23&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
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 0da1e2a..323381b 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
@@ -27,16 +27,16 @@ metadata_expire=0
[fedora]
name=fedora
-#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/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-23&arch=$basearch
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
baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/updates/23/x86_64/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f23&arch=$basearch
failovermethod=priority
#gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-23-primary
#gpgcheck=1
diff --git a/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora.repo b/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora.repo
index a44b8eb..4c5c6c1 100644
--- a/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora.repo
+++ b/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora.repo
@@ -1,6 +1,6 @@
[fedora]
name=fedora
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-23&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
@@ -8,7 +8,7 @@ failovermethod=priority
[updates]
name=updates
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f23&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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git
More information about the Qa-jenkins-scm
mailing list