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

[2019.2.1] Bring nox into 2019.2.1 #52853

Merged

Conversation

@s0undt3ch
Copy link
Member

commented May 7, 2019

What does this PR do?

See title.
More or less what's done in #52848 but cherry picking the changes.

@s0undt3ch s0undt3ch requested a review from saltstack/team-core as a code owner May 7, 2019
@s0undt3ch s0undt3ch force-pushed the s0undt3ch:merge-forward/2018.3-to-2019.2.1-cherry branch 3 times, most recently from 95dbb28 to 029854f May 7, 2019
@s0undt3ch s0undt3ch force-pushed the s0undt3ch:merge-forward/2018.3-to-2019.2.1-cherry branch from 029854f to 7e7281b May 7, 2019
@s0undt3ch

This comment has been minimized.

Copy link
Member Author

commented May 7, 2019

re-run full all

tests/support/gitfs.py Outdated Show resolved Hide resolved
@s0undt3ch

This comment has been minimized.

Copy link
Member Author

commented May 8, 2019

The windows failing test unit.states.test_file.TestFileState.test_file_managed_should_fall_back_to_binary Is being fixed in #52770

s0undt3ch and others added 21 commits Mar 22, 2019
https://codeclimate.com/github/saltstack/salt/pull/51461 had a matching
block with mass of 38. Apparently that's too low because that code was
not even the same at all. Bumping it up a bit to avoid false positives.

Also disable argument count checks because we really don't need that
here.
…kes on that
…orms
dwoz and others added 20 commits Apr 28, 2019
This prevents a deprecation warning due to the "encoding" argument being
deprecated in version 0.5.2.
@s0undt3ch s0undt3ch force-pushed the s0undt3ch:merge-forward/2018.3-to-2019.2.1-cherry branch from 5463250 to 5d0bcd0 May 8, 2019
@s0undt3ch

This comment has been minimized.

Copy link
Member Author

commented May 8, 2019

re-run full all

Changes salt's testing config, which is what testing is all about, but
does not change the underlying OS.
@s0undt3ch s0undt3ch force-pushed the s0undt3ch:merge-forward/2018.3-to-2019.2.1-cherry branch from 5d0bcd0 to a8f7b46 May 8, 2019
@Akm0d Akm0d self-requested a review May 8, 2019
@s0undt3ch

This comment has been minimized.

Copy link
Member Author

commented May 8, 2019

This should be good to go in.
Any other failures on 2019.2.1 can be addressed in particular.

@Akm0d
Akm0d approved these changes May 8, 2019
@s0undt3ch s0undt3ch merged commit a510edf into saltstack:2019.2.1 May 9, 2019
17 checks passed
17 checks passed
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 Python lint test has passed
Details
jenkins/pr/py2-centos-6 The py2-centos-6 job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-debian-8 The py2-debian-8 job has passed
Details
jenkins/pr/py2-debian-9 The py2-debian-9 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-ubuntu-1804 The py2-ubuntu-1804 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-debian-8 The py3-debian-8 job has passed
Details
jenkins/pr/py3-debian-9 The py3-debian-9 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-ubuntu-1804 The py3-ubuntu-1804 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.