-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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
Use systemd
in test containers
#5044
Conversation
I removed the mocked |
I'll make a separate PR from 097e758. Just leaving it in here at the moment as it is a requirement for some OS to pass the test. I'll rebase once the other PR is merged. Add: |
Converting to draft until I've figured out why CentOS 8 needs 2:45h to pass the test on GH. Runs fine locally within 5 mins. |
95e7898
to
8e6bb15
Compare
According to the logs this is still taking a long time for Centos8 - have you got to the bottom of why? |
I don't think this is necessary as |
I think yes, that's why I created the PR. All distros use |
I just pushed the identical commits to a new branch and created PR #5057 and it finished in 4 minutes for CentOS8 |
Maybe there was just something wrong a week ago and it just needed a kick today. I think we can close the other PR.
One thing I do like here is that it removes some of the clusterfuck code in the tests that mocks systemctl, and anything we can do to make the tests easier to follow and maintain is a good thing in my book. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
8e6bb15
to
c9da8e0
Compare
Conflicts have been resolved. A maintainer will review the pull request shortly. |
661a2a5
to
c07bd23
Compare
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
e1fb9f7
to
c10102e
Compare
Conflicts have been resolved. |
Signed-off-by: Christian König <ckoenig@posteo.de>
Conflicts have been resolved. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: Christian König <ckoenig@posteo.de>
Conflicts have been resolved. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: Christian König <ckoenig@posteo.de>
Conflicts have been resolved. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: Christian König <ckoenig@posteo.de>
Conflicts have been resolved. |
Signed-off-by: Christian König <ckoenig@posteo.de>
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: Christian König <ckoenig@posteo.de>
Conflicts have been resolved. |
Existing merge conflicts have not been addressed. This PR is considered abandoned. |
What does this PR aim to accomplish?:
PR #4924 added a native
systemd
service file. All our currently supported OS run systemd. However, during the automatic test suite we don't runsystemd
so far and mocksystemctl
call.pi-hole/test/test_any_automated_install.py
Lines 172 to 181 in 0034538
Some images already require installation of an initsystem (e.g. centoOS and Fedora). This PR adds
systemd
as initsystem to the images so that the containers start withsystemd
as PID 1. This mimics the real-world OS situation better.How does this PR accomplish the above?:
systemd
packages to the images.Starts the test containers withUses--privileged
instead of--cap-add=ALL
(required to startsystemd
within the container)podman
instead ofdocker
as container managersystemctl
from the test suite.pihole restartdns
to usesystemctl
instead ofservice
if available. See this PR Allow pihole restart via systemctl #5045 for more detailsBy submitting this pull request, I confirm the following:
git rebase
)