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

Add watchdog as a bundled dependency on Windows #52818

Merged
merged 29 commits into from Aug 9, 2019

Conversation

@twangboy
Copy link
Contributor

commented May 2, 2019

What does this PR do?

Adds watchdog to the requirements file for Windows. This will add some iNotify behavior to Windows via the watchdog beacon.

What issues does this PR fix or reference?

#52804

Tests written?

NA

Commits signed with GPG?

Yes

@dwoz
dwoz approved these changes May 2, 2019
@twangboy

This comment has been minimized.

Copy link
Contributor Author

commented May 10, 2019

re-run full all

@twangboy twangboy self-assigned this May 10, 2019
@Ch3LL

This comment has been minimized.

Copy link
Contributor

commented May 10, 2019

re-run full all

@Ch3LL

This comment has been minimized.

Copy link
Contributor

commented May 10, 2019

i want to make sure these tests run tests/unit/beacons/test_watchdog.py and do not get skipped.

@twangboy twangboy added the 2019.2.1 label May 13, 2019
@twangboy

This comment has been minimized.

Copy link
Contributor Author

commented May 17, 2019

@Ch3LL This should get the tests runnin: saltstack/salt-jenkins#1404

@twangboy twangboy added the Neon label May 17, 2019
@twangboy twangboy force-pushed the twangboy:add_watchdog branch from 500566a to c5596af May 17, 2019
@s0undt3ch s0undt3ch force-pushed the twangboy:add_watchdog branch 2 times, most recently from 27fd3d0 to 43649e9 May 24, 2019
@twangboy twangboy added the ZD label May 31, 2019
@twangboy twangboy force-pushed the twangboy:add_watchdog branch from c863e07 to 289fc34 May 31, 2019
@twangboy twangboy force-pushed the twangboy:add_watchdog branch from b9bbef4 to 4df7636 Jun 15, 2019
tests/unit/beacons/test_watchdog.py Outdated Show resolved Hide resolved
requirements/static/windows.in Outdated Show resolved Hide resolved
@twangboy twangboy force-pushed the twangboy:add_watchdog branch from 2844057 to 0a3e5d9 Jul 5, 2019
@s0undt3ch

This comment has been minimized.

Copy link
Member

commented Jul 5, 2019

Sorry, I didn't think this through.
We need to keep watchdog out of windows.in but it should be included in the linux'es .in files and also OSX .in files if it's not present in pkg/osx/reqs.txt

So sorry.

@twangboy twangboy force-pushed the twangboy:add_watchdog branch from a930156 to 31b05cc Jul 5, 2019
@Akm0d
Akm0d approved these changes Jul 9, 2019
twangboy and others added 8 commits May 2, 2019
twangboy and others added 21 commits Jul 5, 2019
@twangboy twangboy force-pushed the twangboy:add_watchdog branch from 100b498 to 2658634 Aug 7, 2019
@dwoz dwoz merged commit 9eb2938 into saltstack:2019.2.1 Aug 9, 2019
24 checks passed
24 checks passed
WIP Ready for review
Details
ci/docs This commit looks good
Details
ci/lint This commit looks good
Details
ci/py2/amazon2 This commit looks good
Details
ci/py2/centos6 This commit looks good
Details
ci/py2/centos7 This commit looks good
Details
ci/py2/centos7/tcp This commit looks good
Details
ci/py2/debian8 This commit looks good
Details
ci/py2/debian9 This commit looks good
Details
ci/py2/fedora29 This commit looks good
Details
ci/py2/ubuntu1604 This commit looks good
Details
ci/py2/ubuntu1604/tcp This commit looks good
Details
ci/py2/ubuntu1804 This commit looks good
Details
ci/py2/windows2016 This commit looks good
Details
ci/py3/amazon2 This commit looks good
Details
ci/py3/centos7 This commit looks good
Details
ci/py3/centos7/tcp This commit looks good
Details
ci/py3/debian8 This commit looks good
Details
ci/py3/debian9 This commit looks good
Details
ci/py3/fedora29 This commit looks good
Details
ci/py3/ubuntu1604 This commit looks good
Details
ci/py3/ubuntu1604/tcp This commit looks good
Details
ci/py3/ubuntu1804 This commit looks good
Details
ci/py3/windows2016 This commit looks good
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.