-
Notifications
You must be signed in to change notification settings - Fork 181
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
Refactor salt cleanup step #9384
base: master
Are you sure you want to change the base?
Conversation
👋 Hello! Thanks for contributing to our project. If you are unsure the failing tests are related to your code, you can check the "reference jobs". These are jobs that run on a scheduled time with code from master. If they fail for the same reason as your build, it means the tests or the infrastructure are broken. If they do not fail, but yours do, it means it is related to your code. Reference tests: KNOWN ISSUES Sometimes the build can fail when pulling new jar files from download.opensuse.org . This is a known limitation. Given this happens rarely, when it does, all you need to do is rerun the test. Sorry for the inconvenience. For more tips on troubleshooting, see the troubleshooting guide. Happy hacking! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. I hope we can improve the bootstrap state to avoid such corner cases with file cleanups, but I haven't yet tried to fix it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can improve the way of cleanup instead of rebooting in each step. I just checked the bootstrap state and it's checking for the case of presence the minion config directory, but as you remember while testing after reboot we saw empty config directory even if it was deleted explicitly before reboot.
So suggestion is the following:
- Do not delete
/etc/venv-salt-minion
and/etc/salt
completely - Delete just the following from the config dir:
grains minion_id minion.d/* (except 00-venv.conf) pki/minion/*
minion.d/* (except 00-venv.conf)
can be done withfind /etc/venv-salt-minion/minion.d/ -type f ! -name '00-venv.conf' -delete
00-venv.conf
is only relevant for the salt bundle, for classic salt package it could be transactional_update.conf
, but not sure if it's used in the testsuite, but it shouldn't be a problem to not delete it.
dd98da7
to
d918e07
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
don't forget to squash the commits
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Thanks for rendering all the suggestions to the correct form :-D 👍
What does this PR change?
port of https://github.com/SUSE/spacewalk/pull/25556/ . See there for explanation.
Additional changes from the 5.0 port:
Remove only some files, not whole directories.
Use existing step for removing packages since we have it.
Change the order of file removal and package removal. That is the important part because it saves us from a reboot inbetween these actions. Now with this order the transaction should not be in an inconsistent state after only one reboot. Testing currently to make sure we don't break anything
GUI diff
No difference.
Documentation
No documentation needed: only internal and user invisible changes
DONE
Test coverage
ℹ️ If a major new functionality is added, it is strongly recommended that tests for the new functionality are added to the Cucumber test suite
No tests: already covered
DONE
Links
Issue(s): https://github.com/SUSE/spacewalk/issues/24035
Port(s):
5.0: https://github.com/SUSE/spacewalk/pull/25556/ together with https://github.com/SUSE/spacewalk/pull/25754
4.3: https://github.com/SUSE/spacewalk/pull/25565
Changelogs
Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository
If you don't need a changelog check, please mark this checkbox:
If you uncheck the checkbox after the PR is created, you will need to re-run
changelog_test
(see below)Re-run a test
If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run:
Before you merge
Check How to branch and merge properly!