Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make cockpit-dashboard work with package layering #6556

Closed

Conversation

Projects
None yet
3 participants
@stefwalter
Copy link
Contributor

commented May 15, 2017

Users should be able to install cockpit-dashboard using RPM OSTree package layering.

@stefwalter stefwalter changed the title tools: Fix cockpit.spec chcon hack to work with package layering WIP tools: Fix cockpit.spec chcon hack to work with package layering May 15, 2017

@martinpitt
Copy link
Member

left a comment

Looks good. The remaining integration test failures are unrelated, and particularly the Atomics succeeded - but that's not a surprise as they don't use the dashboard rpm.

Not sure what you mean with "test with real koji build", as the %post stanza won't run during build. But I leave this open for now.

@stefwalter

This comment has been minimized.

Copy link
Contributor Author

commented May 16, 2017

@stefwalter

This comment has been minimized.

Copy link
Contributor Author

commented May 18, 2017

An integration test can pull in cockpit-dashboard from /var/tmp/ in order to do package layering ... however libssh rpm is nowhere offline. So we'd have to do an image change in order to make that part work.

@stefwalter stefwalter force-pushed the stefwalter:post-selinux-hack branch from d4a0f41 to 7b7f431 May 19, 2017

@stefwalter stefwalter force-pushed the stefwalter:post-selinux-hack branch from 7b7f431 to 0e5c9c7 May 19, 2017

@stefwalter stefwalter added the blocked label May 19, 2017

@stefwalter

This comment has been minimized.

Copy link
Contributor Author

commented May 19, 2017

Implementing an integration test for this is blocked on:

projectatomic/rpm-ostree#780

stefwalter added a commit to stefwalter/cockpit that referenced this pull request May 19, 2017

tools: More general workaround for our %post SELinux hack
This isn't a complete feature fix as found in cockpit-project#6556. But certain
operating systems (eg: Atomic) have chcon but it cannot be run
correctly or cannot be run during %post. So make this %post section
recover from failures better.

@stefwalter stefwalter changed the title WIP tools: Fix cockpit.spec chcon hack to work with package layering tools: Fix cockpit.spec chcon hack to work with package layering May 19, 2017

@stefwalter stefwalter changed the title tools: Fix cockpit.spec chcon hack to work with package layering Make cockpit-dashboard work with package layering May 19, 2017

martinpitt added a commit that referenced this pull request May 19, 2017

tools: More general workaround for our %post SELinux hack
This isn't a complete feature fix as found in #6556. But certain
operating systems (eg: Atomic) have chcon but it cannot be run
correctly or cannot be run during %post. So make this %post section
recover from failures better.

Closes #6603

conflicts and blockers, needs re-review

@stefwalter stefwalter force-pushed the stefwalter:post-selinux-hack branch from 0e5c9c7 to 53fd01a Aug 3, 2017

stefwalter added a commit to stefwalter/cockpit that referenced this pull request Aug 3, 2017

tools: Fix cockpit.spec chcon hack to work with package layering
On Atomic Host the package layering runs %post stuff on a read-only
mount, so this %post script fails. It seems like OSTree package
layering is one of the few places where a failing %post script
actually prevents an install.

By using cp && chcon && mv, we can make this hack work with
Atomic Host package layering.

Closes cockpit-project#6556

@stefwalter stefwalter force-pushed the stefwalter:post-selinux-hack branch 2 times, most recently from 10fca11 to 12b47ef Aug 3, 2017

@stefwalter stefwalter removed the blocked label Aug 21, 2017

@stefwalter stefwalter force-pushed the stefwalter:post-selinux-hack branch 2 times, most recently from 48bd7f7 to b24088d Aug 21, 2017

@stefwalter

This comment has been minimized.

Copy link
Contributor Author

commented Aug 22, 2017

@cgwalters FYI these tests will test rpm-ostree package layering hundreds of times a day. Yay.

@petervo petervo force-pushed the stefwalter:post-selinux-hack branch from b24088d to 1514c94 Aug 22, 2017

stefwalter and others added some commits May 15, 2017

tools: Fix cockpit.spec chcon hack to work with package layering
On Atomic Host the package layering runs %post stuff on a read-only
mount, so this %post script fails. It seems like OSTree package
layering is one of the few places where a failing %post script
actually prevents an install.

By using cp && chcon && mv, we can make this hack work with
Atomic Host package layering.

Closes #6556
Reviewed-by: Peter <petervo@redhat.com>

@petervo petervo force-pushed the stefwalter:post-selinux-hack branch from 1514c94 to 14f1448 Aug 22, 2017

@petervo

This comment has been minimized.

Copy link
Contributor

commented Aug 22, 2017

I reviewed @stefwalter commit, and added a commit to readd the rest of the multimachine tests. Atomics are passing here, continuous is still broken because the image needs updating. I'll update it in another PR.

stefwalter added a commit that referenced this pull request Aug 23, 2017

test: Enable all the multi machine tests on atomic
Closes #6556
Reviewed-by: Stef Walter <stefw@redhat.com>

@stefwalter stefwalter deleted the stefwalter:post-selinux-hack branch Aug 23, 2017

@martinpitt

This comment has been minimized.

Copy link
Member

commented Sep 8, 2017

@stefwalter , @petervo: This is rather confusing -- this PR doesn't actually change the .spec, just runs the tests for dashboard on Atomic now. That proves that it actually does work, but I suppose the actual fix was done in an earlier PR? Perhaps #7132, commit 6ef7d66?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.