Koji 1.17.0 and Python 3
Hey all, I've proposed a pull request to switch our Koji package to use Python 3 wherever possible: https://src.fedoraproject.org/rpms/koji/pull-request/4 The PR is a bit complex, but it's based on the upstream spec for Koji, which accounts for all the variations (Py2 Koji + Py3 client for Fedora < 30, Py3 Koji + client + Py2 API for Fedora 30+, Py2 Koji for EPEL). I'd like to merge this in and submit updates for all currently supported releases we ship the Koji package to (Fedora and EPEL). Note that this is independent of testing and upgrading the infrastructure. But I'd like to merge this in now so that we could look at having staging Koji switch over now. -- 真実はいつも一つ！/ Always, there's only one truth! ___ infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-le...@lists.fedoraproject.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedoraproject.org
Re: How do we turn zchunk on for updates-testing for F30?
On Sat, 2019-03-09 at 21:29 +0100, Mikolaj Izdebski wrote:
> On Sat, Mar 9, 2019 at 2:29 PM Jonathan Dieter
> wrote:
> > Hey, I just noticed that, while we have zchunked metadata for the
> > F30
> > base repository, it's not enabled to for updates-testing.
> >
> > I've looked in the ansible repo and in pungi, but I can't see where
> > createrepo_c is actually called for updates-testing. Can someone
> > please point me in the right direction?
>
> createrepo for updates-testing is ran by pungi. I believe you need to
> enable zchunk in pungi.conf (createrepo_extra_args option). For
> non-modular updates-testing the config is
> roles/bodhi2/backend/templates/pungi.rpm.conf.j2 in ansible.git.
> Similarly, for modular equivalent, pungi config is located at
> roles/bodhi2/backend/templates/pungi.module.conf.j2
Thanks for pointing me in the right direction. I think I've got it,
complete with a conditional so we don't start generating zchunk
metadata for F29 updates.
There doesn't seem to be a way to generate pull requests on
https://infrastructure.fedoraproject.org/cgit/ansible.git, so I'm
attaching the support as a patch. If there's a better way for me to
send it in, please let me know.
Jonathan
P.S. It may be a small and simple patch, but I haven't actually tested
it and am not sure how to go about doing so.
From 17eefaa1cefb624afa0cf95d04e7f337ba70cb42 Mon Sep 17 00:00:00 2001
From: Jonathan Dieter
Date: Sat, 9 Mar 2019 22:52:48 +
Subject: [PATCH] Add zchunk support to updates and updates-testing
repositories
This adds zchunk support for the updates and updates-testing repositories
for both rpms and modularity
Signed-off-by: Jonathan Dieter
---
roles/bodhi2/backend/templates/pungi.module.conf.j2 | 3 +++
roles/bodhi2/backend/templates/pungi.rpm.conf.j2| 3 +++
2 files changed, 6 insertions(+)
diff --git a/roles/bodhi2/backend/templates/pungi.module.conf.j2 b/roles/bodhi2/backend/templates/pungi.module.conf.j2
index bb021eb13..7dad35403 100644
--- a/roles/bodhi2/backend/templates/pungi.module.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.module.conf.j2
@@ -59,6 +59,9 @@ greedy_method = 'build'
createrepo_c = True
createrepo_checksum = 'sha256'
createrepo_deltas = False
+[% if release.version_int >= 30 %]
+createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/f[[ release.version_int ]]']
+[% endif %]
#jigdo
create_jigdo = False
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 8d9e9a3f2..020736aee 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -66,6 +66,9 @@ createrepo_deltas = [
('^Everything$', {'*': True})
]
createrepo_database = True
+[% if release.version_int >= 30 %]
+createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/f[[ release.version_int ]]']
+[% endif %]
# CHECKSUMS
media_checksums = ['sha256']
--
2.20.1
___
infrastructure mailing list -- infrastructure@lists.fedoraproject.org
To unsubscribe send an email to infrastructure-le...@lists.fedoraproject.org
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedoraproject.org
Re: How do we turn zchunk on for updates-testing for F30?
On Sat, Mar 9, 2019 at 2:29 PM Jonathan Dieter wrote: > > Hey, I just noticed that, while we have zchunked metadata for the F30 > base repository, it's not enabled to for updates-testing. > > I've looked in the ansible repo and in pungi, but I can't see where > createrepo_c is actually called for updates-testing. Can someone > please point me in the right direction? createrepo for updates-testing is ran by pungi. I believe you need to enable zchunk in pungi.conf (createrepo_extra_args option). For non-modular updates-testing the config is roles/bodhi2/backend/templates/pungi.rpm.conf.j2 in ansible.git. Similarly, for modular equivalent, pungi config is located at roles/bodhi2/backend/templates/pungi.module.conf.j2 -- Mikolaj Izdebski ___ infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-le...@lists.fedoraproject.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedoraproject.org
Re: How do we turn zchunk on for updates-testing for F30?
On Sat, 2019-03-09 at 09:43 -0500, Neal Gompa wrote: > On Sat, Mar 9, 2019 at 8:28 AM Jonathan Dieter > wrote: > > Hey, I just noticed that, while we have zchunked metadata for the > > F30 > > base repository, it's not enabled to for updates-testing. > > > > I've looked in the ansible repo and in pungi, but I can't see where > > createrepo_c is actually called for updates-testing. Can someone > > please point me in the right direction? > > > > Updates repos are handled by Bodhi, so you'll want to look there. If I'm reading the code correctly looks like Bodhi creates the repodata using pungi. Currently, fedora.conf in the pungi-fedora repo is set to create zchunk metadata for the branches f30 and master. Could updates- testing maybe be using a different branch? Jonathan ___ infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-le...@lists.fedoraproject.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedoraproject.org
Re: How do we turn zchunk on for updates-testing for F30?
On Sat, Mar 9, 2019 at 8:28 AM Jonathan Dieter wrote: > > Hey, I just noticed that, while we have zchunked metadata for the F30 > base repository, it's not enabled to for updates-testing. > > I've looked in the ansible repo and in pungi, but I can't see where > createrepo_c is actually called for updates-testing. Can someone > please point me in the right direction? > Updates repos are handled by Bodhi, so you'll want to look there. -- 真実はいつも一つ！/ Always, there's only one truth! ___ infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-le...@lists.fedoraproject.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedoraproject.org
How do we turn zchunk on for updates-testing for F30?
Hey, I just noticed that, while we have zchunked metadata for the F30 base repository, it's not enabled to for updates-testing. I've looked in the ansible repo and in pungi, but I can't see where createrepo_c is actually called for updates-testing. Can someone please point me in the right direction? Jonathan ___ infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-le...@lists.fedoraproject.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedoraproject.org
