Debian packaging and testing #452
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Bah -- no |
martinpitt
added a commit
to martinpitt/cockpit-podman
that referenced
this pull request
Jul 23, 2020
- Adjust the `make vm` rule to pull in the rpm or deb bits depending on `$TEST_OS`. - Adjust test/vm.install to build Debian source and binary packages, and install it from there. - Enable user namespaces in the kernel. This still requires a good deal of bug workarounds. Closes cockpit-project#452
martinpitt
force-pushed
the
debian-package
branch
from
585b463 to
a0abe9f
Compare
martinpitt
added a commit
to martinpitt/cockpit-podman
that referenced
this pull request
Jul 23, 2020
- Adjust the `make vm` rule to pull in the rpm or deb bits depending on `$TEST_OS`. - Adjust test/vm.install to build Debian source and binary packages, and install it from there. - Enable user namespaces in the kernel. This still requires a good deal of bug workarounds. Closes cockpit-project#452
martinpitt
force-pushed
the
debian-package
branch
from
a0abe9f to
f2abad2
Compare
martinpitt
added a commit
to martinpitt/cockpit-podman
that referenced
this pull request
Jul 23, 2020
- Adjust the `make vm` rule to pull in the rpm or deb bits depending on `$TEST_OS`. - Adjust test/vm.install to build Debian source and binary packages, and install it from there. - Enable user namespaces in the kernel. This still requires a good deal of bug workarounds. Closes cockpit-project#452
martinpitt
force-pushed
the
debian-package
branch
from
f2abad2 to
569c516
Compare
|
On debian-testing, system podman.service fails with user podman seems to work better, I can at least do stuff. So while most tests will still be broken, I think this is good enough progress to land this -- debian-testing isn't yet triggered automatically. |
|
https://bugs.debian.org/966118 got fixed in the meantime, so dropping the hack. Rebased to current master. |
martinpitt
added a commit
to martinpitt/cockpit-podman
that referenced
this pull request
Jul 29, 2020
- Adjust the `make vm` rule to pull in the rpm or deb bits depending on `$TEST_OS`. - Adjust test/vm.install to build Debian source and binary packages, and install it from there. - Enable user namespaces in the kernel. This still requires a good deal of bug workarounds. Closes cockpit-project#452
martinpitt
force-pushed
the
debian-package
branch
from
569c516 to
62bf051
Compare
|
Been playing with this for a bit and here are three things I noticed:
|
martinpitt
added a commit
to martinpitt/cockpit-podman
that referenced
this pull request
Jul 29, 2020
- Adjust the `make vm` rule to pull in the rpm or deb bits depending on `$TEST_OS`. - Adjust test/vm.install to build Debian source and binary packages, and install it from there. - Enable user namespaces in the kernel. This still requires a good deal of bug workarounds. Closes cockpit-project#452
martinpitt
force-pushed
the
debian-package
branch
from
62bf051 to
d2712b2
Compare
|
Yay, 2.0.2 is in testing now, so I dropped the "get from unstable" hack and put back the "install correct units" hack. I filed https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=966501 to block 2.0.3 from entering testing. Once 2.0.4 hits testing, we can clean all that up. |
marusak
previously approved these changes
Jul 29, 2020
packaging/debian/control
Outdated
| @@ -3,7 +3,6 @@ Section: admin | |||
| Priority: optional | |||
| Maintainer: Cockpit <[email protected]> | |||
| Build-Depends: debhelper-compat (= 12), | |||
| appstream-util, | |||
There was a problem hiding this comment.
This commit debian: Drop appstream-util check could be merged into the previous one as it directly fixes it.
There was a problem hiding this comment.
That was by intent -- it's easier to revert once we get appstream-util into the Debian image's pbuilder.
We don't test RHEL 8.2 on master any more, and this file does not exist on Debian.
Put it into packaging/, as having a top-level debian/ directory in the upstream tarball collides with downstream packaging.
Our current debian-testing bots image does not have appstream-util in its pbuilder. We validate it in upstream CI already, so that is not very important.
- Adjust the `make vm` rule to pull in the rpm or deb bits depending on `$TEST_OS`. - Adjust test/vm.install to build Debian source and binary packages, and install it from there. - Enable user namespaces in the kernel. This still requires a good deal of bug workarounds. Closes cockpit-project#452
Stop podman.service before setting up the /var/lib/containers/ overlay directory, so that we don't clobber an already existing /overlay mount inside it. Also, stop podman.service before tearing down the temporary /var/lib/containers/. Don't enable podman.socket in vm.install, as the tests already do it, and talking to podman before the restore_dir() would mess things up.
martinpitt
force-pushed
the
debian-package
branch
from
d2712b2 to
dce9601
Compare
|
I think I fixed the /overlay thing now. Tests still fail but "much less bad" 😁 |
|
Yay, there's (at least) one successful test now 🎉 |
martinpitt
added a commit
that referenced
this pull request
Jul 29, 2020
- Adjust the `make vm` rule to pull in the rpm or deb bits depending on `$TEST_OS`. - Adjust test/vm.install to build Debian source and binary packages, and install it from there. - Enable user namespaces in the kernel. This still requires a good deal of bug workarounds. Closes #452
|
Does this mean that |
Please see #481 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
podman 2.0 is now in Debian unstable, so I'd like to start testing it there. It would be nice to upload cockpit-podman to Debian once we have something working decently.
After hammering on it a lot, I now have
TEST_OS=debian-testing make vmworking. Let's see how it fares in actual testing!