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

Merged
merged 60 commits into from Aug 9, 2018

Conversation

Projects
None yet
10 participants
@rallytime
Contributor

rallytime commented Aug 8, 2018

Conflicts:

  • doc/man/salt-api.1
  • doc/man/salt-call.1
  • doc/man/salt-cloud.1
  • doc/man/salt-cp.1
  • doc/man/salt-key.1
  • doc/man/salt-master.1
  • doc/man/salt-minion.1
  • doc/man/salt-proxy.1
  • doc/man/salt-run.1
  • doc/man/salt-ssh.1
  • doc/man/salt-syndic.1
  • doc/man/salt-unity.1
  • doc/man/salt.1
  • doc/man/salt.7
  • doc/man/spm.1
  • salt/beacons/log.py
  • salt/client/ssh/init.py
  • salt/modules/cmdmod.py
  • salt/utils/win_functions.py
  • tests/integration/modules/test_cmdmod.py
  • tests/integration/netapi/rest_tornado/test_app.py
  • tests/integration/runners/test_state.py

gtmanfred and others added some commits Apr 16, 2018

Fix win_pkg issues introduced Jan 2018. If DisplayVersion does not ex…
…ist it should return version as "Not Found"
Fix batch install using pkgng
For fully automated batch installing in FreeBSD you need to pass BATCH=true.
No rehashing in parallel
Rehashing in parallel causes pyenv to fail, if they're run at almost the
exact same time. It's breaking our lint tests pretty horribly.
Update backticks on job_cache docs
There's an extra backtick after the `job_cache` link, and not enough
backticks around `keep_jobs` parameter.
Merge pull request #48866 from Ch3LL/cmd_win_tests
Add cmd module integration tests for windows and fix space in path issue
Merge pull request #48922 from rallytime/cache-doc-error
Update backticks on job_cache docs
Fixing failing test, integration.modules.test_service.ServiceModuleTe…
…st.test_service_disable_doesnot_exist, on Debian 8 and higher.
Merge pull request #48933 from garethgreenaway/1022_debian_8_failing_…
…service-test

[2017.7] Fix to test_service_disable_doesnot_exist
Merge pull request #48891 from damon-atkins/2017.7_win_pkg.list_pkgs_…
…not_found

win_pkg: Fix issue introduced in Jan 2018 DisplayVersion missing should result…
Merge pull request #47100 from gtmanfred/ssh
Allow for not being prompted to supply a password to deploy keys to a…
Merge pull request #48935 from garethgreenaway/1045_test_pkg_015_inst…
…alled_held_centos

[2017.7] Fix to test_pkg.test_pkg_015_installed_held
Mark some shell and runner integration tests as flaky
In addition to marking these tests as flaky, the commit also updates
the affected tests to use pytest notation instead of unittest notation.
Merge pull request #48943 from rallytime/flaky-tests
Mark some shell and runner integration tests as flaky
Added a quote to kitchen Jenkinsfiles
Kitchen wasn't running correctly
Merge pull request #48950 from KaiSforza/kitchenfix-2017.7
Added a quote to kitchen Jenkinsfiles

rallytime and others added some commits Aug 6, 2018

Merge pull request #48955 from terminalmage/service-systemd
Don't load service.py if minion is running a non-sysvinit init system
Merge pull request #48957 from whytewolf/beacons_log_doc_change
Update salt.beacons.log to reflect that re module is used for matching.
Merge pull request #48960 from dwoz/block_replace_tests
Multiple block replace test fixes
Merge pull request #48962 from garethgreenaway/1022_test_service_disa…
…ble_debian_part_deux

[2017.7] Fixing tests/integration/modules/test_service.py
Merge pull request #48968 from rallytime/man-pages
Update man pages for 2017.7.8 release
Skip unreliable tornado tests
Marked as flaky originally, but they're still flaky with undetermined
race-conditions. These are skipped in 2018.3 and forward, so let's skip
them here as well.
clean up gemfile
Remove opennebula, since we are using docker and ec2
Pin winrm to the package since our changes have been released by
upstream
Merge pull request #48959 from rallytime/flaky-tests
Mark some more tests as flaky
Merge pull request #48976 from rallytime/tornado
Skip unreliable tornado tests
Merge pull request #48988 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.8 to 2017.7
Update expected return value in boto test
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
Merge branch '2017.7' into '2018.3'
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/beacons/log.py
  - salt/client/ssh/__init__.py
  - salt/modules/cmdmod.py
  - salt/utils/win_functions.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/runners/test_state.py
Revert "add key-deploy test"
This reverts commit 5b443af.
Revert "Allow for not being prompted to supply a password to deploy k…
…eys to a minion with salt-ssh"

This reverts commit a131c9b.

@rallytime rallytime merged commit d7b7a92 into saltstack:2018.3 Aug 9, 2018

6 of 8 checks passed

jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has failed
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
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/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 9, 2018

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