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 #47564

Merged
merged 29 commits into from May 10, 2018

Conversation

Projects
None yet
7 participants
@rallytime
Contributor

rallytime commented May 9, 2018

Conflicts:

  • tests/integration/modules/test_status.py
  • tests/integration/states/test_pip_state.py
  • tests/support/case.py
  • tests/whitelist.txt

Ch3LL and others added some commits Apr 30, 2018

Skip trying to render a template for a nonexistant SLS file
This skips an unnecssary call to compile_template, and also prevents a
confusing error message: "Template was specified incorrectly: False",
for cases when an SLS target specified in a top file does not exist.
Rename pip state test modules to match naming convention
This makes the naming match the naming convention used throughout the
test suite and will make the changes in
#47337 work better.
Add support for windows timeout to run_salt
The run_salt function needs to support timeout on windows for the full
test suite to run.
Merge pull request #47493 from dwoz/win_run_timeout
Add support for windows timeout to run_salt
Merge pull request #47499 from dwoz/win_run_timeout_again
Move kill process tree and re-use it
Merge pull request #47505 from dwoz/win_dsc_fixes
Raise proper invocation errors
Merge pull request #47478 from terminalmage/rename-pip-state-test
Rename pip state test modules to match naming convention
Merge pull request #47444 from terminalmage/render_state-spurious-error
Skip trying to render a template for a nonexistant SLS file
Merge pull request #47480 from baniobloom/ConflictingDomainExists
added handling for the aws error ConflictingDomainExists
Merge pull request #47408 from Ch3LL/skip_diskusage
Skip status.diskusage integration tests on macsox
Fix corner case where runas user's HOME env value is incorrect
In the test suite, two of the failing `pip.installed` tests were failing
because when we shelled out to get the user's environment, the `HOME`
environment variable's value was incorrectly showing the root user's
home dir.

This change ensures that we use the correct value for the HOME
environment variable when running a command as another user.
Merge pull request #47524 from dwoz/whitelistlines
Gracefully handle blank lines in whitelist.txt
Merge pull request #47538 from terminalmage/pip-docs
Fix/clarify some of the pip module documentation
Merge pull request #47547 from terminalmage/gitfs-tutorial
Add masterless mode docs to gitfs tutorial
Merge pull request #47540 from terminalmage/cmdmod-home-fix
Fix corner case where runas user's HOME env value is incorrect
Merge branch '2017.7' into '2018.3'
Conflicts:
  - tests/integration/modules/test_status.py
  - tests/integration/states/test_pip_state.py
  - tests/support/case.py
  - tests/whitelist.txt
@cachedout

This comment has been minimized.

Contributor

cachedout commented May 10, 2018

Hmm, we've got GitFS failures here now too.

@rallytime

This comment has been minimized.

Contributor

rallytime commented May 10, 2018

I don't believe those are related. They have the "Can the master be contacted" warning that pops up on the tests sometimes. Let's see how the next run goes.

@rallytime

This comment has been minimized.

Contributor

rallytime commented May 10, 2018

re-run py2

@rallytime rallytime merged commit 9836a7e into saltstack:2018.3 May 10, 2018

5 of 9 checks passed

default Pull Requests » Salt PR - Main Build - PY2/PY3 #8565
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #4815 — ABORTED
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #22747 — FAILURE
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #18871 — RUNNING
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #24992 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17106 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #9784 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #21726 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch May 10, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment