Skip to content

tests: misc-ro: make systemd-resolved service check conditional #646

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
dustymabe merged 2 commits into from
Sep 30, 2020
Merged

tests: misc-ro: make systemd-resolved service check conditional #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb99d8d
manifest: Include systemd-resolved for F33 change
jdoss Aug 22, 2020
afa1c9e
tests: misc-ro: make systemd-resolved service check conditional
dustymabe Sep 30, 2020
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
3 changes: 0 additions & 3 deletions manifests/fedora-coreos-base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ check-groups:
default-target: multi-user.target

remove-from-packages:
# We're not using resolved yet.
- [systemd, /usr/lib/systemd/systemd-resolved,
/usr/lib/systemd/system/systemd-resolved.service]
# We're not using networkd.
- [systemd, /etc/systemd/networkd.conf,
/usr/lib/systemd/systemd-networkd,
Expand Down
21 changes: 19 additions & 2 deletions tests/kola/misc-ro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,25 @@ get_journal_msg_timestamp() {
| jq -r --slurp '.[0]["__MONOTONIC_TIMESTAMP"]'
}

systemctl is-enabled logrotate.service
ok logrotate
# Test some services are enabled or disabled appropriately
for unit in logrotate; do
if ! systemctl is-enabled ${unit} 1>/dev/null; then
fatal "Unit ${unit} should be enabled"
fi
done
# systemd-resolved should be disabled on f32 but
# enabled on f33+.
source /etc/os-release
Copy link
Copy Markdown
Member

@jlebon jlebon Sep 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I usually prefer to source this in a subshell to avoid polluting the env, but this is OK too.

if systemctl is-enabled systemd-resolved 1>/dev/null; then
if [ "$VERSION_ID" == "32" ]; then
fatal "Unit ${unit} should not be enabled"
fi
else
if [ "$VERSION_ID" != "32" ]; then
fatal "Unit ${unit} should be enabled"
fi
fi
ok services

# https://github.com/coreos/fedora-coreos-config/commit/2a5c2abc796ac645d705700bf445b50d4cda8f5f
if ip link | grep -o -e " eth[0-9]:"; then
Expand Down