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

update saltcheck module for Neon #55613

Merged
merged 29 commits into from Jan 6, 2020
Merged

Conversation

mchugh19
Copy link
Contributor

@mchugh19 mchugh19 commented Dec 11, 2019

What does this PR do?

Rebase of #53068 on master

supersedes #52434 #52541 #53024 and #54553

master ports: #49195 #49395 and #53068

  • Optimize test copying (replace cp.cache_master with logic to cp.cache_dir on used salt states) @lomeroe
  • Create saltcheck wrapper for use in salt-ssh. Handles cp.cache_dir functionality by creating a tarball, copying, and extracting on ssh minion. Then calls the regular saltcheck functions.
  • allow custom saltcheck test locations inside a state/formula's folder @lomeroe
  • provide more information on invalid tests @lomeroe

Previous Behavior

  1. saltcheck, being unable to run cp.cache_* from a salt-ssh minion, was not able to locate test files and did not function.
  2. saltcheck was only able to parse an assertion_section of a single depth
  3. cp.cache_master takes more time and I/O than necessary

New Behavior

  1. Wrapper written to gather needed state directories, tarball them, copy tar to salt-ssh minion, extract to local cache directory, and cleanup. Then hands over saltcheck running to the local saltcheck module.
  2. assertion_section can now be nested dicts or lists
  3. Now uses cp.cache_dir on needed state directories

Tests written?

Yes - new integration and ssh integration tests

Commits signed with GPG?

No

@mchugh19 mchugh19 requested a review from as a code owner Dec 11, 2019
@ghost ghost requested a review from twangboy Dec 11, 2019
@mchugh19
Copy link
Contributor Author

@mchugh19 mchugh19 commented Dec 11, 2019

If this looks good and the tests pass, the listed replaces PRs can all be closed, and the referenced master ports can be marked complete.

@dwoz
Copy link
Contributor

@dwoz dwoz commented Dec 13, 2019

@mchugh19 Please resolve the merge conflicts

@mchugh19
Copy link
Contributor Author

@mchugh19 mchugh19 commented Dec 15, 2019

Looks like the windows test failures are unrelated to this PR

AssertionError: There are some functions which do not have a docstring or do not have an example:
No docstring:
  - pkg.get_package_info

@mchugh19 mchugh19 mentioned this pull request Dec 20, 2019
@waynew waynew added this to PR needs merge to master in PRs to port to master via automation Dec 26, 2019
@waynew
Copy link
Contributor

@waynew waynew commented Dec 26, 2019

@mchugh19 looks like there's a merge conflict here, but the windows tests passed. Mind resolving that conflict?

@waynew
Copy link
Contributor

@waynew waynew commented Dec 26, 2019

Also this test failure but it doesn't look like it's related, so it might be a flaky test? :suspect:

@mchugh19
Copy link
Contributor Author

@mchugh19 mchugh19 commented Dec 27, 2019

Resolved conflict with release notes

@dwoz
Copy link
Contributor

@dwoz dwoz commented Jan 6, 2020

Windows tests passed even though the build failed

OK (total=9658, skipped=1248, passed=8410, failures=0, errors=0)

Merging

dwoz
dwoz approved these changes Jan 6, 2020
@dwoz dwoz merged commit 9e5df06 into saltstack:master Jan 6, 2020
48 of 49 checks passed
PRs to port to master automation moved this from PR needs merge to master to PR merged Jan 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants