Skip to content
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

2018.3 fix for list compound targeting #49907

Merged

Conversation

Projects
None yet
6 participants
@brejoc
Copy link
Member

commented Oct 5, 2018

What does this PR do?

This is a follow up of #49435 (and a replacement for #49897), but for 2018.3 instead of develop.

What issues does this PR fix or reference?

Issue: #49205
PR to develop. #49435

Previous Behavior & New Behavior

Please see the comments in #49435.

Tests written?

No. Only very small adjustments to existing test.

Commits signed with GPG?

Yes

brejoc and others added some commits Aug 30, 2018

No longer passes missing in list compound engine
Missing targets cause a very odd behaviour in combination with a
"not" statement and don't seem to be used in every other case.

Having a compound list target like "not L@foominion" would cause
a return for "foominon" even though it doesn't exist. Returning
an empty list for "missing" fixes that.
Ignore missing minions only when excluding them with 'not'
Co-authored-by: Mihai Dinca <Mihai.Dinca@suse.com>
Minor fix for def test_batch_run_grains_targeting
item was never "minion" without a colon, but os_grain was overwritten
anyway. So this fix does not actually affect the test outcome.
Adds check for engine before adding the additional engine argument
The additional engine argument is only intended to be used with the
_check_list_minons engine and shouldn't be added for every other engine.

@brejoc brejoc requested a review from saltstack/team-core as a code owner Oct 5, 2018

@salt-jenkins salt-jenkins requested a review from saltstack/team-suse Oct 5, 2018

@meaksh

meaksh approved these changes Oct 5, 2018

@rallytime
Copy link
Contributor

left a comment

This LGTM, but I'd like @terminalmage to take a look here as well.

@rallytime rallytime requested review from terminalmage and gtmanfred Oct 5, 2018

@isbm

isbm approved these changes Oct 10, 2018

@rallytime rallytime merged commit e427306 into saltstack:2018.3 Oct 10, 2018

8 of 10 checks passed

jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.