Test cleanup cherry-picks (3.27)#6137
Open
olehermanse wants to merge 22 commits into
Open
Conversation
Member
Author
|
This one will fail until I've made the PRs for the other repos. |
This was referenced May 19, 2026
Merged
Merged
Closed
Member
Author
|
@cf-bottom jenkins, please |
nickanderson
approved these changes
May 19, 2026
olehermanse
force-pushed
the
3.27.x-cherry
branch
3 times, most recently
from
4ec6977 to
2e6fe1d
Compare
…d JSON These tests are not about trailing commas, so might as well make them valid JSON. Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 884d40f)
We use .x.cf as a convention for invalid files, so might as well standardize. Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 9ff7df8)
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 210c807)
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 4ce06f5)
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 9e294cd)
This is a CFEngine policy file and should have a .cf file extension. These definitions are necessary for cfengine lint to find when it's looking for all the bodies and bundles defined in all .cf policy files. Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit ce3639b)
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit a5643af)
Created a follow-up: https://northerntech.atlassian.net/browse/ENT-14034 Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 71c998a)
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 0bc51e1)
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 60b6978)
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit d93f71f)
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 0c3420a)
Some of these are overlapping, have misleading comments, and are testing too much at the same time. We want to make them easier to read and understand, and put the parts specific to testing that you can put invalid / future syntax inside macros in its own test(s). Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 96d35e7)
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 8a25540)
cfengine lint generally considers empty files to be a problem, because they could be the result of a failed transfer, failed write, or similar. Thus, adding a comment here to avoid having an empty .cf file. Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 3abc099)
Didn't change all of them - left the ones which seem like the test is for testing ifvarclass specifically. Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 7bbf5af)
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit f5d8e6a)
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 6390696)
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit a23ea1e)
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
olehermanse
force-pushed
the
3.27.x-cherry
branch
from
2120ace to
a223a33
Compare
Ticket: none Changelog: none (cherry picked from commit a4689ef)
|
Sure, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/13822/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-13822/ |
larsewi
approved these changes
May 20, 2026
craigcomstock
approved these changes
May 20, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
TODO:
Merge together:
#6137
cfengine/masterfiles#3157
https://github.com/cfengine/enterprise/pull/912