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

[2018.3] Merge forward from 2017.7 to 2018.3 #52310

Merged
merged 18 commits into from Mar 26, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Mar 25, 2019

Conflicts:

  • None
s0undt3ch and others added 17 commits Mar 18, 2019
https://gist.github.com/s0undt3ch/9298a69a3492404d89a832de9efb1e68

This only happens when XML reporting is enabled.
Why only now, I have no clue.
This is also removing the use of dev_*.ps1 scripts in the windows builds
Use windows state to bootstrap windows builds
This reverts commit dce4ffa.
…ries
After this version, the library started taking into account expected
failures which Jenkins treats as regular failures.
@garethgreenaway garethgreenaway requested a review from saltstack/team-core Mar 25, 2019
@garethgreenaway garethgreenaway merged commit 3211397 into saltstack:2018.3 Mar 26, 2019
10 checks passed
10 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-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 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-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
@garethgreenaway garethgreenaway deleted the garethgreenaway:merge-2018.3 branch Apr 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.