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

[develop] global splay for scheduler #46525

Merged
merged 2 commits into from Apr 5, 2018

Conversation

@garethgreenaway
Copy link
Member

@garethgreenaway garethgreenaway commented Mar 13, 2018

What does this PR do?

Adding the ability to set a global splay for all jobs in the scheduler. Useful for setting splay to internal jobs. Also adding additional integration tests to test global splay as well as per job splay options.

What issues does this PR fix or reference?

#46462

Tests written?

Yes

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@garethgreenaway garethgreenaway force-pushed the garethgreenaway:46462_global_splay branch from 940e86c to 4bec572 Mar 13, 2018
@rallytime
Copy link
Contributor

@rallytime rallytime commented Mar 20, 2018

@garethgreenaway There's a conflicting file on this one now. Can you fix that up?

…r. Useful for setting splay to internal jobs. Also adding additional integration tests to test global splay as well as per job splay options.
@garethgreenaway garethgreenaway force-pushed the garethgreenaway:46462_global_splay branch from b04ab53 to a82fa7a Mar 20, 2018
@cachedout cachedout requested a review from s0undt3ch Apr 5, 2018
@@ -1314,10 +1316,13 @@ def _handle_until(job, data):
self.skip_during_range = schedule['skip_during_range']
if 'enabled' in schedule:
self.enabled = schedule['enabled']
if 'splay' in schedule:
self.splay = schedule['splay']

This comment has been minimized.

@s0undt3ch

s0undt3ch Apr 5, 2018
Member

Won't this override your global set value at init time?

This comment has been minimized.

@s0undt3ch

s0undt3ch Apr 5, 2018
Member

Oh. You're not passing it as a class init argument.

@cachedout
Copy link
Contributor

@cachedout cachedout commented Apr 5, 2018

re-run all

@rallytime
Copy link
Contributor

@rallytime rallytime commented Apr 5, 2018

re-run py

@cachedout
Copy link
Contributor

@cachedout cachedout commented Apr 5, 2018

@rallytime This should be ready once tests run.

@rallytime rallytime merged commit 8ca50bb into saltstack:develop Apr 5, 2018
5 of 10 checks passed
5 of 10 checks passed
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #8640 — ABORTED
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #17860 — ABORTED
Details
default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #3814 — FAILURE
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #21577 — FAILURE
Details
@wip
WIP ready for review
Details
codeclimate All good!
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #23977 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #16137 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #20756 — SUCCESS
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants