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 2018.3.3 to 2018.3 #49316

Merged
merged 32 commits into from Aug 25, 2018

Conversation

Projects
None yet
8 participants
@rallytime
Copy link
Contributor

commented Aug 24, 2018

Conflicts:

  • salt/modules/file.py
  • tests/integration/states/test_file.py

weswhet and others added some commits Aug 10, 2018

Merge pull request #49137 from Ch3LL/bootstrap_2018.3.3
[2018.3.3] Update bootstrap script to latest release (2018.08.15)
Merge pull request #49142 from Ch3LL/rm_z_arg
Remove -Z script_arg for cloud tests
Mike Place
Multiple fixes for integration.states.test_file
- Fix wart in PR #49087 file://c:\foo\bar vs c:\foo\bar local paths
- Finalize fix for test_issue_8343_accumulated_require_in
- Fix wart in PR #49088 Ignore proper directory test
Fix hanging syndic test
There was no `syndic_master` and the fallback DNS lookup failed. This
caused a traceback which hung the test suite.
Mike Place
Don't use a bare except!
Every time you use a bare except, Cthulu kills a kitten. Please, think
of the kittens.
Don't silently catch SystemExit
In `integration.shell.test_syndic.SyndicTest.test_issue_7754`, we use
`run_script` to start up a syndic and make sure that it starts with
specific logging configuration. `run_script` is configured to timeout
after 5 seconds, at which time the process is killed via SIGTERM. Our
signal handler then raises a `SystemExit` to kill the Python process.
However, if this `SystemExit` is raised while `_connect_syndic()` is
attempting to connect to the master-of-masters, it gets swallowed and
the Python process never exits, causing the test suite to hang
indefinitely (until test-kitchen kills it).

This commit ensures we re-raise a `SystemExit` if it is caught during
this connection attempt.
Merge pull request #49239 from Ch3LL/win_yaml_test
Use yaml's safe_dump in windows ec2 tests
Merge pull request #49241 from terminalmage/salt-jenkins-1078
Don't silently catch SystemExit
Merge pull request #49294 from Ch3LL/fed_28_tests
Move run_function call from __init__ to setup
use os._exit instead of sys.exit when daemonizing
According to the docs [here](https://docs.python.org/3/library/os.html#os._exit)

> `os._exit` should should normally only be used in the child process after a fork().

This will exit the process with status n, without calling cleanup
handlers, flushing stdio buffers, etc.

Fixes saltstack/salt-jenkins#1075

rallytime added some commits Aug 24, 2018

Merge branch '2018.3.3' into '2018.3'
Conflicts:
  - salt/modules/file.py
  - tests/integration/states/test_file.py

@rallytime rallytime requested a review from saltstack/team-core as a code owner Aug 24, 2018

@gtmanfred gtmanfred merged commit 6b2eba7 into saltstack:2018.3 Aug 25, 2018

8 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 The lint job 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/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Aug 28, 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.