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 merge wart #49528

Merged
merged 1 commit into from Sep 6, 2018

Conversation

Projects
None yet
2 participants
@dwoz
Copy link
Contributor

commented Sep 6, 2018

What does this PR do?

Fix wart in whitelist.txt

Tests written?

No

Commits signed with GPG?

Yes

@dwoz dwoz requested a review from rallytime Sep 6, 2018

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Sep 6, 2018

@dwoz Ah sorry, I mixed this up in my merge-forward. Thanks for fixing this again. :)

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Sep 6, 2018

@dwoz Any idea on why so many of the windows tests are failing on PRs, but not on the branch? I see only 6 tests failing on the Py3 windows tests for 2018.3 branch, for example, but there are 27 on this PR.

I have been seeing more tests fail on PRs than I think are failing on the branches. I just wanted to make sure that was something you're aware of.

@dwoz

This comment has been minimized.

Copy link
Contributor Author

commented Sep 6, 2018

@rallytime I'm not sure why there is a difference in the number of failures. So far I've been chalking things like that up to flaky test runs. I've re-launched the windows PR builds to see if the results are consistent.

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Sep 6, 2018

@dwoz Sounds good. Let's get those flaky tests fixed or marked as such so we can make sure the signaling is as best as it can be, as long as that is on your radar!

@dwoz dwoz merged commit 06935e9 into saltstack:2018.3 Sep 6, 2018

5 of 10 checks passed

jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has failed
Details
jenkins/pr/py3-centos-7 running py3-centos-7...
Details
jenkins/pr/py3-ubuntu-1604 running py3-ubuntu-1604...
Details
jenkins/pr/py3-windows-2016 running py3-windows-2016...
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details

@dwoz dwoz deleted the dwoz:mergetests branch Sep 17, 2018

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.