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

Fix #22063: pillar wildcard support include #45269

Merged
merged 19 commits into from Jan 26, 2018

Conversation

Projects
None yet
8 participants
@wych42
Copy link
Contributor

commented Jan 4, 2018

What does this PR do?

Wildcard in pillar support include. e.g.:

include:
  - sub_include_state_*

will render every state file matches pattern sub_include_state_*.

What issues does this PR fix or reference?

#22063

Tests written?

Not yet, working on it.

Commits signed with GPG?

Yes/partial.

wych42 and others added some commits Jan 4, 2018

@wych42 wych42 force-pushed the wych42:pillar_wildcard_include branch from d99e8a4 to 2604877 Jan 4, 2018

@rallytime rallytime requested review from cachedout and terminalmage Jan 4, 2018

@terminalmage
Copy link
Contributor

left a comment

Looks good, pending tests being added.

@wych42 wych42 force-pushed the wych42:pillar_wildcard_include branch from 15a58dc to 27965a7 Jan 5, 2018

wych42 and others added some commits Jan 6, 2018

@wych42

This comment has been minimized.

Copy link
Contributor Author

commented Jan 6, 2018

@terminalmage I have add a test on this, but the jenkins pipeline didn't pass, I can't reproduce the failure tests on my local machine either Mac or Ubuntu host. Now I have no clue how to debug this, can I get some help from you?

marlowew added some commits Jan 9, 2018

@wych42

This comment has been minimized.

Copy link
Contributor Author

commented Jan 10, 2018

CI failed because

06:52:42  * Starting salt-syndic ... 06:52:41,529 [salt.modules.vsphere                     :213 ][ERROR   ] pyVmomi not loaded: Incompatible versions of Python. See Issue #29537.

It looks like python version in jenkins is

06:43:55 * Python Version: 2.7.5 (default, Aug 4 2017, 00:39:18) [GCC 4.8.5 20150623 (Red Hat 4.8.5-16)]

which is not compatible with pyVmomi.

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Jan 10, 2018

re-run py

1 similar comment
@rallytime

This comment has been minimized.

Copy link
Contributor

commented Jan 11, 2018

re-run py

@cachedout

This comment has been minimized.

Copy link
Collaborator

commented Jan 11, 2018

@rallytime It has been too long since I have been in this code for me to knowledgeably review it. I think we should have some more core folks go over it.

@cachedout cachedout removed their request for review Jan 11, 2018

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Jan 12, 2018

@cachedout Of course, no problem!

@terminalmage
Copy link
Contributor

left a comment

@marlowew I don't understand why you added your tests inside a test function for malformed pillar SLS. Don't they belong in their own test?

Also, the pyVmomi error is completely unrelated and it is not causing any failures. It's also not referenced at all in tests/unit/test_pillar.py. That error is nothing to worry about, if we can't import that module then we just end up skipping the tests that use it.

marlowew and others added some commits Jan 15, 2018

@wych42

This comment has been minimized.

Copy link
Contributor Author

commented Jan 15, 2018

@terminalmage You are right. I have pushed another commit and put unit test for include pillar in separated function.

@garethgreenaway Please have another look at the latest commit.

@rallytime rallytime requested a review from terminalmage Jan 18, 2018

@terminalmage
Copy link
Contributor

left a comment

marlowew and others added some commits Jan 22, 2018

@wych42

This comment has been minimized.

Copy link
Contributor Author

commented Jan 22, 2018

@terminalmage The last commit has solved broken malformed_pillar_sls test.

@rallytime rallytime requested a review from terminalmage Jan 22, 2018

marlowew added some commits Jan 24, 2018

@rallytime

This comment has been minimized.

@wych42 wych42 requested a review from saltstack/team-core as a code owner Jan 26, 2018

@wych42

This comment has been minimized.

Copy link
Contributor Author

commented Jan 26, 2018

@rallytime My bad, and it's fixed.

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Jan 26, 2018

It's all good. Thanks @marlowew!

@rallytime rallytime merged commit b13b897 into saltstack:develop Jan 26, 2018

4 of 10 checks passed

jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #6332 — ABORTED
Details
default Build finished.
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #14155 — FAILURE
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #1779 — FAILURE
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #19368 — FAILURE
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #15807 — FAILURE
Details
WIP ready for review
Details
codeclimate All good!
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #21786 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #18762 — SUCCESS
Details

@wych42 wych42 deleted the wych42:pillar_wildcard_include branch Jan 26, 2018

@cachedout

This comment has been minimized.

Copy link
Collaborator

commented Feb 7, 2018

@rallytime Will this make it into Oxygen?

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Feb 7, 2018

@cachedout No, it was submitted against the develop branch. It will be in Fluorine.

@anitakrueger

This comment has been minimized.

Copy link
Contributor

commented May 7, 2018

Any chance you could port this into the 2018.3 branch? I think a lot of people will be benefit from this and it was in the code base for 2 months before Oxygen was released.

@gtmanfred

This comment has been minimized.

Copy link
Contributor

commented May 7, 2018

@anitakrueger unfortunately it was submitted after the feature freeze for the 2018.3 release, which we need in order to stabilize 2018.3, so it will have to wait until the next feature release, which will be Fluorine.

@anitakrueger

This comment has been minimized.

Copy link
Contributor

commented May 7, 2018

@gtmanfred thanks for letting me know.

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.