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

Remove custom grains module from 2018.3 branch #51445

Merged

Conversation

Projects
None yet
2 participants
@terminalmage
Copy link
Contributor

commented Jan 31, 2019

Support for passing the grains data to custom grains modules wasn't added until the 2019.2 release cycle. It seems like this file was included when something else was backported to 2018.3. This results in the following harmless traceback in the test suite:

Traceback (most recent call last):
  File "/tmp/kitchen/testing/salt/loader.py", line 778, in grains
    ret = funcs[key](proxy)
  File "/tmp/salt-tests-tmpdir/rootdir/var/cache/salt/minion/extmods/grains/custom_grains.py", line 5, in test
    return {'custom_grain_test': 'itworked' if 'os' in grains else 'itdidntwork'}
TypeError: argument of type 'NoneType' is not iterable

(It's harmless because nothing actually tests this grain until 2019.2)

@garethgreenaway @Ch3LL Please note that this will cause the following test to fail upon being merged into 2019.2:

integration.grains.test_custom.TestGrainsCore.test_grains_passed_to_custom_grain

So, when doing a merge-forward, you'll want to do a git revert <commit_id>, where <commit_id> is the commit ID for this change, and add it to the pull request for the merge from 2018.3 to 2019.2.

Remove custom grains module from 2018.3 branch
Support for passing the grains data to custom grains modules wasn't
added until the 2019.2 release cycle. It seems like this file was
included when something else was backported to 2018.3.

@terminalmage terminalmage force-pushed the terminalmage:fix-custom-grains-traceback branch from 9e7a00b to 191235d Jan 31, 2019

@terminalmage terminalmage requested a review from saltstack/team-core as a code owner Jan 31, 2019

@terminalmage terminalmage changed the base branch from 2018.3 to 2018.3.4 Jan 31, 2019

@terminalmage

This comment has been minimized.

Copy link
Contributor Author

commented Jan 31, 2019

Rebased PR onto 2018.3.4 branch to fix saltstack/salt-jenkins#1273

@terminalmage terminalmage merged commit 48936c2 into saltstack:2018.3.4 Feb 1, 2019

7 checks passed

WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details

@terminalmage terminalmage deleted the terminalmage:fix-custom-grains-traceback branch Feb 1, 2019

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.