From 2faeeb2ded41e56691abb0313f2447358e49355a Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 12 Dec 2015 19:23:24 +0100 Subject: reproducible fedora rpms: configure mock and yum on jenkins the same as on pb-build3 --- hosts/jenkins/etc/mock/fedora-23-x86_64.cfg | 70 ++++++++++++++++++++++++ hosts/jenkins/etc/yum/repos.d/fedora-23-src.repo | 7 +++ hosts/jenkins/etc/yum/repos.d/fedora.repo | 11 ++++ update_jdn.sh | 5 +- 4 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 hosts/jenkins/etc/mock/fedora-23-x86_64.cfg create mode 100644 hosts/jenkins/etc/yum/repos.d/fedora-23-src.repo create mode 100644 hosts/jenkins/etc/yum/repos.d/fedora.repo diff --git a/hosts/jenkins/etc/mock/fedora-23-x86_64.cfg b/hosts/jenkins/etc/mock/fedora-23-x86_64.cfg new file mode 100644 index 00000000..aa78fa58 --- /dev/null +++ b/hosts/jenkins/etc/mock/fedora-23-x86_64.cfg @@ -0,0 +1,70 @@ +config_opts['root'] = 'fedora-23-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) +config_opts['chroot_setup_cmd'] = 'install @buildsys-build' +config_opts['dist'] = 'fc23' # only useful for --resultdir variable subst +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['releasever'] = '23' + +config_opts['yum.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +install_weak_deps=0 +metadata_expire=0 + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&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 +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 +# dhiru's repository, see https://github.com/kholia/ReproducibleBuilds +# this is the same person: dhiru = kholia = halfie +baseurl=https://fedorapeople.org/~halfie/repository/ +enabled=1 +""" diff --git a/hosts/jenkins/etc/yum/repos.d/fedora-23-src.repo b/hosts/jenkins/etc/yum/repos.d/fedora-23-src.repo new file mode 100644 index 00000000..fb948356 --- /dev/null +++ b/hosts/jenkins/etc/yum/repos.d/fedora-23-src.repo @@ -0,0 +1,7 @@ +[fedora-23-src] +name=fedora 23 sources +baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/releases/23/Everything/source/SRPMS +enabled=1 +gpgcheck=0 +#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release + diff --git a/hosts/jenkins/etc/yum/repos.d/fedora.repo b/hosts/jenkins/etc/yum/repos.d/fedora.repo new file mode 100644 index 00000000..a431739d --- /dev/null +++ b/hosts/jenkins/etc/yum/repos.d/fedora.repo @@ -0,0 +1,11 @@ +[fedora] +name=Fedora $releasever - $basearch +failovermethod=priority +#baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/releases/$releasever/Everything/$basearch/os/ +baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/releases/23/Everything/x86_64/os/ +enabled=1 +#metadata_expire=7d +gpgcheck=0 +#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False + diff --git a/update_jdn.sh b/update_jdn.sh index cb29b5e5..ad06d7aa 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -263,7 +263,8 @@ if [ -f /etc/debian_version ] ; then libvirt-dev libvpx1 libxslt1-dev - linux-image-amd64 + linux-image-amd64 + mock moreutils mr mtr-tiny @@ -340,7 +341,7 @@ fi # # prepare mock to build rpms # -if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] ; then +if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] || [ "$HOSTNAME" = "jenkins" ] ; then if ! grep mock /etc/group ; then sudo groupadd --system mock sudo usermod -a -G mock jenkins -- cgit v1.2.3-54-g00ecf