Skip to content

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

Merged
dustymabe merged 2 commits intocoreos:testing-develfrom
dustymabe:dusty-systemd-resolved
Sep 30, 2020
Merged

tests: misc-ro: make systemd-resolved service check conditional#646
dustymabe merged 2 commits intocoreos:testing-develfrom
dustymabe:dusty-systemd-resolved

Conversation

@dustymabe
Copy link
Member

Make the systemd-resolved service check conditional on Fedora major
version. In Fedora 32 it should be disabled. In Fedora 33+ it should
be enabled by default.

@dustymabe dustymabe added the hold label Sep 30, 2020
@dustymabe
Copy link
Member Author

will merge after #575

This PR adds the systemd-resolved packages into FCOS. It is going to be used by
default in Fedora 33 per this change request:
https://fedoraproject.org/wiki/Changes/systemd-resolved

Adding the systemd-resolved packages back in gets us ready for this change.
It won't impact how DNS is configured or used and it lets users get ready for
the change in Fedora 33.
@dustymabe dustymabe changed the title tests: misc-ro tests: misc-ro: make systemd-resolved service check conditional Sep 30, 2020
Make the systemd-resolved service check conditional on Fedora major
version. In Fedora 32 it should be disabled. In Fedora 33+ it should
be enabled by default.
@dustymabe dustymabe force-pushed the dusty-systemd-resolved branch from 369c4bd to afa1c9e Compare September 30, 2020 20:00
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

LGTM! I think we can just merge this one and close the other one included here? That avoids sending out a webhook event for a build state which is gonna fail tests anyway.

done
# systemd-resolved should be disabled on f32 but
# enabled on f33+.
source /etc/os-release
Copy link
Member

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.

@dustymabe
Copy link
Member Author

LGTM! I think we can just merge this one and close the other one included here? That avoids sending out a webhook event for a build state which is gonna fail tests anyway.

OK. Will do.

@dustymabe dustymabe removed the hold label Sep 30, 2020
@dustymabe dustymabe merged commit 2d89806 into coreos:testing-devel Sep 30, 2020
@dustymabe dustymabe deleted the dusty-systemd-resolved branch September 30, 2020 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants