test: Use proper ssh service unit on Debian/Ubuntu #20261
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
On Debian/Ubuntu, the unit is called `ssh.socket`, not `sshd.socket`.
Factorize the various hardcoded unit names of the sshd socket and service units into `MachineCase` constants. This will allow us to get rid of the "create sshd.service" alias hack on our Debian/Ubuntu images. This doesn't work any more on current ubuntu-stable, and also hides bugs as on actual installations the service really isn't called `sshd.service`.
martinpitt
requested review from
mvollmer and
jelly
and removed request for
mvollmer
4 tasks
martinpitt
added a commit
to martinpitt/bots
that referenced
this pull request
Apr 4, 2024
Updating the openssh-server package while `sshd.service` is enabled upsets the maintainer script and fails. It also causes `ssh.socket` to fail as the port is already used. This leads to image refresh failures whenever the current cloud image doesn't have the current openssh-server version. cockpit-project/cockpit#20261 fixed Cockpit's tests to not assume `sshd.service` everywhere, so this is obsolete.
martinpitt
added a commit
to martinpitt/bots
that referenced
this pull request
Apr 4, 2024
Updating the openssh-server package while `sshd.service` is enabled upsets the maintainer script and fails. It also causes `ssh.socket` to fail as the port is already used. This leads to image refresh failures whenever the current cloud image doesn't have the current openssh-server version. cockpit-project/cockpit#20261 fixed Cockpit's tests to not assume `sshd.service` everywhere, so this is obsolete.
jelly
pushed a commit
to cockpit-project/bots
that referenced
this pull request
Apr 4, 2024
Updating the openssh-server package while `sshd.service` is enabled upsets the maintainer script and fails. It also causes `ssh.socket` to fail as the port is already used. This leads to image refresh failures whenever the current cloud image doesn't have the current openssh-server version. cockpit-project/cockpit#20261 fixed Cockpit's tests to not assume `sshd.service` everywhere, so this is obsolete.
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.
Factorize the various hardcoded unit names of the sshd socket and service units into
MachineCaseconstants.This will allow us to get rid of the "create sshd.service" alias hack on our Debian/Ubuntu images. This doesn't work any more on current ubuntu-stable (see cockpit-project/bots#6172), and also hides bugs as on actual installations the service really isn't called
sshd.service.