-
Notifications
You must be signed in to change notification settings - Fork 189
CFE-4598: Added evaluation order in body file control #5942
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
CFE-4598: Added evaluation order in body file control #5942
Conversation
e7872f4 to
4c3215c
Compare
7be731d to
2270d92
Compare
|
@cf-bottom jenkins, please |
|
Sure, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/13032/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-13032/ |
13:50:19 license-checking.c:658:9: error: too few arguments to function ‘PolicyAppendBundle’
13:50:19 Bundle *bp = PolicyAppendBundle(track_license_policy, NamespaceDefault(), "track_license_bundle", "agent", NULL, NULL);
13:50:19 ^Looks like you'll need some changes in |
6780184 to
a05f4fa
Compare
Changelog: Title Ticket: CFE-4598 Signed-off-by: Victor Moene <[email protected]>
Signed-off-by: Victor Moene <[email protected]>
a05f4fa to
b83278f
Compare
Changelog: Fixed json policy parsing by adding new field "evaluation_order" to the expected output Signed-off-by: Victor Moene <[email protected]>
b83278f to
cce7986
Compare
|
@cf-bottom jenkins, please |
|
Alright, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/13045/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-13045/ |
| else if (StringEqual(P.rval.item, "top_down")) | ||
| { | ||
| P.current_evaluation_order = EVAL_ORDER_TOP_DOWN; | ||
| } |
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.
Should there be an else with parser error?
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.
Then the evaluation order stays as EVALUATION_ORDER_UNDEFINED. But the program will error on the wrong value later anyways, so wd don't really need to check for the right value here
|
@olehermanse, @nickanderson wants to demo this on the agent is in. Can we merge this before release if the tests pass? |
|
The tests look good! @olehermanse, can we merge? |
|
@larsewi yep |
Example:
Merge together:
https://github.com/cfengine/enterprise/pull/869
https://github.com/cfengine/nova/pull/2485