Skip to content

Various test / policy file cleanups guided by cfengine lint#6115

Merged
olehermanse merged 6 commits intocfengine:masterfrom
olehermanse:master
May 7, 2026
Merged

Various test / policy file cleanups guided by cfengine lint#6115
olehermanse merged 6 commits intocfengine:masterfrom
olehermanse:master

Conversation

@olehermanse
Copy link
Copy Markdown
Member

@olehermanse olehermanse commented May 6, 2026 •
edited
Loading

No description provided.

@olehermanse olehermanse requested a review from nickanderson May 6, 2026 14:05
olehermanse added 4 commits May 6, 2026 16:05
@olehermanse
tests: Added comment to empty policy file for cf-execd code test
3abc099 
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 <[email protected]>
@olehermanse
tests: Changed ifvarclass to if in several tests and examples
7bbf5af 
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 <[email protected]>
@olehermanse
tests: Renamed vars_multiple_types to .x.cf
f5d8e6a 
Signed-off-by: Ole Herman Schumacher Elgesem <[email protected]>
@olehermanse
tests: Removed unused test file
3af40f0 
The test using this file was removed in:
ef10f3b

13 years ago.

Signed-off-by: Ole Herman Schumacher Elgesem <[email protected]>
@olehermanse olehermanse added the cherry-pick? Fixes which may need to be cherry-picked to LTS branches label May 6, 2026
@olehermanse olehermanse marked this pull request as ready for review May 6, 2026 14:35
@olehermanse
Copy link
Copy Markdown
Member Author

olehermanse commented May 6, 2026

@cf-bottom jenkins please

@cf-bottom
Copy link
Copy Markdown

cf-bottom commented May 6, 2026

Sure, I triggered a build:

Build Status

Jenkins: https://ci.cfengine.com/job/pr-pipeline/13732/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-13732/

@olehermanse olehermanse removed the request for review from nickanderson May 6, 2026 15:06
olehermanse added 2 commits May 6, 2026 17:09
@olehermanse
tests: Renamed wrong-bundle-type.cf.sub to .sub.x.cf
6390696 
Signed-off-by: Ole Herman Schumacher Elgesem <[email protected]>
@olehermanse
examples: Made sense of augment.cf example
a23ea1e 
Signed-off-by: Ole Herman Schumacher Elgesem <[email protected]>
@olehermanse
Copy link
Copy Markdown
Member Author

olehermanse commented May 6, 2026

Waiting for Jenkins

@craigcomstock
Copy link
Copy Markdown
Contributor

craigcomstock commented May 6, 2026

@cf-bottom jenkins

@cf-bottom
Copy link
Copy Markdown

cf-bottom commented May 6, 2026 •
edited by craigcomstock
Loading

Alright, I triggered a build:

Build Status

Jenkins: https://ci.cfengine.com/job/pr-pipeline/13742/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-13742/

craigcomstock
craigcomstock approved these changes May 6, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@craigcomstock craigcomstock left a comment

Choose a reason for hiding this comment

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

looks fine to me. I am investigating valgrind-check failure in https://northerntech.atlassian.net/browse/ENT-13720

@olehermanse
Copy link
Copy Markdown
Member Author

olehermanse commented May 7, 2026

looks fine to me. I am investigating valgrind-check failure in https://northerntech.atlassian.net/browse/ENT-13720

@craigcomstock My conclusion is that valgrind-checks failure is unrelated, because:

  1. The files I've changed shouldn't have anything to do with what is happening in that test.
  2. The same test is passing in GH Actions.
  3. The error messages in that test are weird and do not seem related to this at all (TLS / Network error, could not connect to 127.0.0.1, etc.)
  4. I clicked retry in Jenkins and it succeeded.

I will go ahead and merge this :)

@cfengine cfengine deleted a comment from cf-bottom May 7, 2026
@olehermanse olehermanse merged commit bc69cb6 into cfengine:master May 7, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nickanderson nickanderson nickanderson approved these changes

@craigcomstock craigcomstock craigcomstock approved these changes

@larsewi larsewi larsewi approved these changes

Assignees

No one assigned

Labels

cherry-pick? Fixes which may need to be cherry-picked to LTS branches

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@olehermanse @cf-bottom @craigcomstock @nickanderson @larsewi