integration: use systemd when $DOCKER_SYSTEMD is set#40493
integration: use systemd when $DOCKER_SYSTEMD is set#40493thaJeztah merged 2 commits intomoby:masterfrom
Conversation
30b580c to
4f93a64
Compare
|
This script is more widely used than just in our CI; wondering if we should have a separate script just for CI if this is needed |
|
Testing should be possible on a laptop as well? |
|
Right, but it's also used in the Also not sure
|
cf6d7d1 to
eb85eca
Compare
|
Updated not to use systemd when systemd is not installed, but I think
I think we can use systemd always. Also, even for rootful with cgroupfs driver, systemd might be useful for simplifying
No, the file needs to be autogenerated (for command args, workdir, and env vars) |
eb85eca to
0019802
Compare
|
Interestingly, this PR seems to have digged up some broken tests that hadn't been executed in CI. |
9705844 to
2d5b0c4
Compare
This comment has been minimized.
This comment has been minimized.
83064d8 to
b6bc28b
Compare
|
@tianon PTAL? |
|
I agree with the intent here (automated testing of more things via |
|
could we add a variant just used for our CI, and keep the standard dind script as-is? |
|
I like that idea, as long as the logistics work for actually using it 😅 |
b6bc28b to
bb0775f
Compare
bb0775f to
f1f1240
Compare
|
Updated to split the script. PTAL. |
f1f1240 to
2d976c1
Compare
|
@tianon PTAL? |
The test was failing:
--- FAIL: TestCgroupDriverSystemdMemoryLimit (1.76s)
cgroupdriver_systemd_test.go:54: assertion failed: 67108864 (s.HostConfig.Memory int64) != 67108864 (mem int)
Signed-off-by: Akihiro Suda <[email protected]>
2d976c1 to
d925440
Compare
Fix moby#40492 Signed-off-by: Akihiro Suda <[email protected]>
d925440 to
a329226
Compare
- What I did
Added systemd in the integration testing image.
This will help testing rootless and systemd stuff.
Fix #40492
- How I did it
Added a variant of
hack/dindscript:hack/dind-systemd.This script executes the arguments as a systemd service in foreground with tty connected, and then call
systemctl exit $EXIT_STATUSto shutdown the systemd process with the expected exit code.- How to verify it
DOCKER_SYSTEMD=1 make test-integration- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)
🐧