Here are a few patches for getting everything in order for F28 for Atomic Host/OSTree.
Signed-off-by: Dusty Mabe dusty@dustymabe.com --- .../files/robosignatory.production.py | 34 +++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/roles/robosignatory/files/robosignatory.production.py b/roles/robosignatory/files/robosignatory.production.py index 021dee325..668d176ae 100644 --- a/roles/robosignatory/files/robosignatory.production.py +++ b/roles/robosignatory/files/robosignatory.production.py @@ -217,7 +217,27 @@ config = { 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-28' }, - 'fedora/28/x86_64/workstation': { + 'fedora/28/x86_64/updates/atomic-host': { + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', + 'key': 'fedora-28' + }, + 'fedora/28/ppc64le/updates/atomic-host': { + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', + 'key': 'fedora-28' + }, + 'fedora/28/aarch64/updates/atomic-host': { + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', + 'key': 'fedora-28' + }, + 'fedora/28/x86_64/testing/atomic-host': { + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', + 'key': 'fedora-28' + }, + 'fedora/28/ppc64le/testing/atomic-host': { + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', + 'key': 'fedora-28' + }, + 'fedora/28/aarch64/testing/atomic-host': { 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-28' }, @@ -225,6 +245,18 @@ config = { 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-29' }, + 'fedora/28/x86_64/workstation': { + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', + 'key': 'fedora-28' + }, + 'fedora/28/x86_64/updates/workstation': { + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', + 'key': 'fedora-28' + }, + 'fedora/28/x86_64/testing/workstation': { + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', + 'key': 'fedora-28' + }, 'fedora/rawhide/ppc64le/atomic-host': { 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-29'
We'll start doing it for f28-u when we get the kinks worked out after the first F28 Atomic Host release.
Signed-off-by: Dusty Mabe dusty@dustymabe.com --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index d92ad4f16..287c03177 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -180,7 +180,7 @@ ostree = { } [% endif %]
-[% if release.id_prefix == 'FEDORA' and release.version_int >= 28 %] +[% if release.id_prefix == 'FEDORA' and release.version_int >= 28 and request.name == 'testing' %] global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f%5B%5B release.version_int ]]' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso'
Signed-off-by: Dusty Mabe dusty@dustymabe.com --- roles/bodhi2/backend/files/new-updates-sync | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 827e8cfcd..adfd5c2f0 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -22,7 +22,18 @@ ATOMICDEST = '/mnt/koji/atomic/repo/' RELEASES = {'f28': {'topic': 'fedora', 'version': '28', 'modules': ['fedora', 'fedora-secondary'], - 'repos': {'updates-testing': { + 'repos': {'updates': { + 'from': 'f28-updates', + 'ostrees': [{'ref': 'fedora/28/%(arch)s/updates/atomic-host', + 'dest': ATOMICDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/28/x86_64/updates/workstation', + 'dest': ATOMICDEST}], + # Hack around for the fact that ostree on f25 doesn't know links + {'ref': 'fedora/28/x86_64/workstation', + 'dest': ATOMICDEST}], + 'to': []}}, + 'updates-testing': { 'from': 'f28-updates-testing', 'ostrees': [{'ref': 'fedora/28/%(arch)s/testing/atomic-host', 'dest': ATOMICDEST,
On 04/23/2018 05:50 PM, Kevin Fenzi wrote:
On 04/23/2018 02:38 PM, Dusty Mabe wrote:
Here are a few patches for getting everything in order for F28 for Atomic Host/OSTree.
Whats the timing here? When do we need to land these? After we have f28 in the box and are starting to push 0-day updates? or before then?
Ideally now. We'd like to start running the nightly atomic compose: https://pagure.io/pungi-fedora/pull-request/600
On 04/23/2018 03:23 PM, Dusty Mabe wrote:
On 04/23/2018 05:50 PM, Kevin Fenzi wrote:
On 04/23/2018 02:38 PM, Dusty Mabe wrote:
Here are a few patches for getting everything in order for F28 for Atomic Host/OSTree.
Whats the timing here? When do we need to land these? After we have f28 in the box and are starting to push 0-day updates? or before then?
Ideally now. We'd like to start running the nightly atomic compose: https://pagure.io/pungi-fedora/pull-request/600
ok. Sounds good to me then... +1
kevin
Reviewed the PR. +1
On 23 April 2018 at 18:59, Kevin Fenzi kevin@scrye.com wrote:
On 04/23/2018 03:23 PM, Dusty Mabe wrote:
On 04/23/2018 05:50 PM, Kevin Fenzi wrote:
On 04/23/2018 02:38 PM, Dusty Mabe wrote:
Here are a few patches for getting everything in order for F28 for Atomic Host/OSTree.
Whats the timing here? When do we need to land these? After we have f28 in the box and are starting to push 0-day updates? or before then?
Ideally now. We'd like to start running the nightly atomic compose: https://pagure.io/pungi-fedora/pull-request/600
ok. Sounds good to me then... +1
kevin
infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-leave@lists.fedoraproject.org
On 04/23/2018 05:31 PM, Dusty Mabe wrote:
On 04/23/2018 07:10 PM, Stephen John Smoogen wrote:
Reviewed the PR. +1
Thanks all - Merged.. Kevin do you mind running the relevant playbooks to make the changes take effect? I don't think I have permission for all of those.
I can, but is everything in place for the new-updates-sync? That will start going right after I run the playbook.
I'm not 100% sure what needs to be restarted on robosign, so perhaps Patrick could apply that in the morning tomorrow and restart whatever is needed.
Otherwise I can plan on running things tomorrow before the updates pushes...
kevin
On 04/23/2018 09:11 PM, Kevin Fenzi wrote:
On 04/23/2018 05:31 PM, Dusty Mabe wrote:
On 04/23/2018 07:10 PM, Stephen John Smoogen wrote:
Reviewed the PR. +1
Thanks all - Merged.. Kevin do you mind running the relevant playbooks to make the changes take effect? I don't think I have permission for all of those.
I can, but is everything in place for the new-updates-sync? That will start going right after I run the playbook.
I believe so. It will just try to sync the refs in the compose repo over into prod. It should be ok, but we can wait for patrick to run the playbooks tomorrow.
I'm not 100% sure what needs to be restarted on robosign, so perhaps Patrick could apply that in the morning tomorrow and restart whatever is needed.
OK
Otherwise I can plan on running things tomorrow before the updates pushes...
K
infrastructure@lists.fedoraproject.org