Skip to content

USHIFT-5391: Optimize systemd-resolved package uninstallation #4556

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 18, 2025
Merged

USHIFT-5391: Optimize systemd-resolved package uninstallation #4556

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions test/suites/osconfig/systemd-resolved.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Documentation Verify MicroShift host name resolution with and without syst
Resource ../../resources/common.resource
Resource ../../resources/microshift-host.resource
Resource ../../resources/microshift-process.resource
Resource ../../resources/ostree.resource
Resource ../../resources/ostree-health.resource
Resource ../../resources/systemd.resource

Expand Down Expand Up @@ -131,31 +132,18 @@ Uninstall Systemd-Resolved
[Documentation] Remove the systemd-resolved package

${is_ostree}= Is System OSTree
IF ${is_ostree} == ${TRUE}
${stdout} ${stderr} ${rc}= Execute Command
... rpm-ostree override remove systemd-resolved
... sudo=True return_rc=True return_stdout=True return_stderr=True
Should Be Equal As Integers 0 ${rc}
IF ${is_ostree} == ${TRUE} Create Usr Directory Overlay

Reboot MicroShift Host
Wait Until Greenboot Health Check Exited
ELSE
${stdout} ${stderr} ${rc}= Execute Command
... dnf remove -y systemd-resolved
... sudo=True return_rc=True return_stdout=True return_stderr=True
Should Be Equal As Integers 0 ${rc}
END
${stdout} ${stderr} ${rc}= Execute Command
... rpm -ev systemd-resolved
... sudo=True return_rc=True return_stdout=True return_stderr=True
Should Be Equal As Integers 0 ${rc}

Restore Systemd-Resolved
[Documentation] Install the systemd-resolved package

${is_ostree}= Is System OSTree
IF ${is_ostree} == ${TRUE}
${stdout} ${stderr} ${rc}= Execute Command
... rpm-ostree rollback
... sudo=True return_rc=True return_stdout=True return_stderr=True
Should Be Equal As Integers 0 ${rc}

Reboot MicroShift Host
Wait Until Greenboot Health Check Exited
ELSE
Expand Down