A patch to enable the composition of F22 updates & updates-testing ostree branches
0001-bodhi-Compose-atomic-ostrees-for-F22-updates-updates.patch

This might be me misunderstanding, but it looks like
{{{
updates-testing -> ref': 'fedora-atomic/f22/x86_64/docker-host',
}}}
But:
{{{
updates -> 'ref': 'fedora-atomic/f22/x86_64/updates/docker-host',
}}}

Don't we actually want:

{{{
updates -> fedora-atomic/f22/x86_64/docker-host
updates-testing -> fedora-atomic/f22/x86_64/testing/docker-host
}}}

?

Yep, you're right. I have this patch queued up in git and will push it out after the current updates push is done.

{{{

!patch

--- a/modules/bodhi/files/atomic-config.py
+++ b/modules/bodhi/files/atomic-config.py
@@ -17,7 +17,7 @@ config = dict(
'tree': 'docker-host',
'treefile': {
'include': 'fedora-atomic-docker-host.json',
- 'ref': 'fedora-atomic/f22/x86_64/updates/docker-host',
+ 'ref': 'fedora-atomic/f22/x86_64/docker-host',
'repos': ['fedora-22-branched', 'updates'],
'packages': [],
},
@@ -44,7 +44,7 @@ config = dict(
'tree': 'docker-host',
'treefile': {
'include': 'fedora-atomic-docker-host.json',
- 'ref': 'fedora-atomic/f22/x86_64/docker-host',
+ 'ref': 'fedora-atomic/f22/x86_64/testing/docker-host',
'repos': ['fedora-22-branched', 'updates', 'updates-testing'],
'packages': [],
},

}}}

Since we're currently frozen, a +1 or two would be helpful.

Also, do we want to clean up these stray refs before the final release? If so, how do we go about doing that?

we need to put the tree from the compose box in place first. or know how to merge it in with the existing tree, we should likely also prune the f22 tree to just the gold commit. then add updates on top of it

Note that the current updates push is currently failing on f22-atomic so we need to sort this out asap. ;)

Replying to [comment:5 ausil]:

we need to put the tree from the compose box in place first. or know how to merge it in with the existing tree, we should likely also prune the f22 tree to just the gold commit. then add updates on top of it

Okay, so we're waiting for someone to put the gold tree into place? It looks like /mnt/koji/mash/atomic contains f22 and rawhide refs at the moment.

I moved /mnt/fedora_koji/koji/mash/atomic/22 to /mnt/fedora_koji/koji/mash/atomic/22-branched then I hardlinked /mnt/fedora_koji/compose/atomic to /mnt/fedora_koji/koji/mash/atomic/22 followed by a chown masher:masher to make sure bodhi can update it all okay. So the tree that holds the commit for f22 final is now in place.

The f22-updates atomic tree compose is currently failing with this error during the rpm-ostree compose process.

{{{
Moving /boot
Using boot location: both
error: Permission denied
}}}
http://paste.fedoraproject.org/225142/43249001/

The fedora-atomic-docker-host.json on the f22 branch in fedora-atomic.git also still uses the fedora-22-bleed repo.

https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-docker-host.json?h=f22

That looks like rpm-ostree was trying to do a hardlink inside the temporary directory which failed. There are a few things that could cause link(2) to fail with EPERM,

Okay, can you try this update: https://admin.fedoraproject.org/updates/libgsystem-2015.1-2.fc22

I'd like to understand the configuration here. So we're now trying to do the model where rpm-ostree runs as root, writing to a repo owned by masher:masher?

We made an initial attempt to support this configuration, but I discovered further issues: https://bugzilla.gnome.org/show_bug.cgi?id=738954#c4

Until I get a chance to fully implement (and test) this configuration, the most reliable thing is going to be something like rsyncing the repo locally, running rpm-ostree, then chowning it, then rsyncing it back.

Replying to [comment:10 walters]:

That looks like rpm-ostree was trying to do a hardlink inside the temporary directory which failed. There are a few things that could cause link(2) to fail with EPERM,

Okay, can you try this update: https://admin.fedoraproject.org/updates/libgsystem-2015.1-2.fc22

I'd like to understand the configuration here. So we're now trying to do the model where rpm-ostree runs as root, writing to a repo owned by masher:masher?

AFAIK, nothing has changed with regard to how these updates trees are composed. We're still running rpm-ostree in mock the same way that we always have done it with the fedmsg-atomic-composer.

Replying to [comment:10 walters]:

Okay, can you try this update: https://admin.fedoraproject.org/updates/libgsystem-2015.1-2.fc22

We're still hitting the same error with that update.

The error was due to an SELinux issue that has now been resolved. f22-updates & updates-testing ostree commits should have been made.

We should be all set here.