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.

Sign up for GitHub

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

Jump to bottom

[2018.3] Merge forward from 2017.7 to 2018.3 #49011

Merged
merged 60 commits into from
Aug 9, 2018
Merged

[2018.3] Merge forward from 2017.7 to 2018.3 #49011

merged 60 commits into from
Aug 9, 2018

Commits on Jul 31, 2018

  1. Allow for not being prompted to supply a password to deploy keys to a… 

    … minion with salt-ssh
    @gtmanfred
    gtmanfred committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    a131c9b View commit details
    Browse the repository at this point in the history

  2. add key-deploy test

    @gtmanfred
    gtmanfred committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    5b443af View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2018

  1. Add cmd module integration tests for windows and fix space in path issue

    @Ch3LL
    Ch3LL committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    9312a99 View commit details
    Browse the repository at this point in the history

  2. make sure we lower the check on shell

    @Ch3LL
    Ch3LL committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    62c66ba View commit details
    Browse the repository at this point in the history

  3. use a specific path for just the cmd._run call

    @Ch3LL
    Ch3LL committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    391bb8a View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2018

  1. Add docs for new escape kwarg

    @Ch3LL
    Ch3LL committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    3be11e0 View commit details
    Browse the repository at this point in the history

  2. Fix win_pkg issues introduced Jan 2018. If DisplayVersion does not ex… 

    …ist it should return version as "Not Found"
    @damon-atkins
    damon-atkins committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    a4af1db View commit details
    Browse the repository at this point in the history

  3. Fix batch install using pkgng 

    For fully automated batch installing in FreeBSD you need to pass BATCH=true.
    Felipe Zipitria authored and rallytime committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    0503bc1 View commit details
    Browse the repository at this point in the history

  4. Forgot variable in signature

    Felipe Zipitria authored and rallytime committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    4995922 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2018

  1. 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.
    @KaiSforza
    KaiSforza authored and rallytime committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    a55f929 View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#48920 from rallytime/bp-48904-2017.7 

    Back-port saltstack#48904 to 2017.7
    @gtmanfred
    gtmanfred committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    57d58e7 View commit details
    Browse the repository at this point in the history

  3. Update backticks on job_cache docs 

    There's an extra backtick after the `job_cache` link, and not enough
backticks around `keep_jobs` parameter.
    rallytime committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    8ca89df View commit details
    Browse the repository at this point in the history

  4. Merge branch '2017.7' into cmd_win_tests

    Nicole Thomas committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    905da13 View commit details
    Browse the repository at this point in the history

  5. Merge pull request saltstack#48866 from Ch3LL/cmd_win_tests 

    Add cmd module integration tests for windows and fix space in path issue
    Nicole Thomas committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    8d1fc4f View commit details
    Browse the repository at this point in the history

  6. Merge pull request saltstack#48922 from rallytime/cache-doc-error 

    Update backticks on job_cache docs
    Nicole Thomas committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    0c3d2c6 View commit details
    Browse the repository at this point in the history

  7. Merge branch '2017.7' into bp-48730

    Nicole Thomas committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    57aa204 View commit details
    Browse the repository at this point in the history

  8. Fixing failing test, integration.modules.test_service.ServiceModuleTe… 

    …st.test_service_disable_doesnot_exist, on Debian 8 and higher.
    @garethgreenaway
    garethgreenaway committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    280d1d2 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2018

  1. Fixing the test_pkg_015_installed_held test to be able to successfull… 

    …y run on CentOS
    @garethgreenaway
    garethgreenaway committed Aug 4, 2018
    Configuration menu
    Copy the full SHA
    24d5e6a View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2018

  1. Merge pull request saltstack#48933 from garethgreenaway/1022_debian_8… 

    …_failing_service-test

[2017.7] Fix to test_service_disable_doesnot_exist
    Nicole Thomas committed Aug 5, 2018
    Configuration menu
    Copy the full SHA
    0c64bba View commit details
    Browse the repository at this point in the history

  2. Merge branch '2017.7' into 1045_test_pkg_015_installed_held_centos

    Nicole Thomas committed Aug 5, 2018
    Configuration menu
    Copy the full SHA
    0bb1010 View commit details
    Browse the repository at this point in the history

  3. Merge pull request saltstack#48896 from rallytime/bp-48730 

    Back-port saltstack#48730 to 2017.7
    Nicole Thomas committed Aug 5, 2018
    Configuration menu
    Copy the full SHA
    5f6a56f View commit details
    Browse the repository at this point in the history

  4. Merge pull request saltstack#48891 from damon-atkins/2017.7_win_pkg.l… 

    …ist_pkgs_not_found

win_pkg: Fix issue introduced in Jan 2018 DisplayVersion missing should result…
    Nicole Thomas committed Aug 5, 2018
    Configuration menu
    Copy the full SHA
    d541bd6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request saltstack#47100 from gtmanfred/ssh 

    Allow for not being prompted to supply a password to deploy keys to a…
    Nicole Thomas committed Aug 5, 2018
    Configuration menu
    Copy the full SHA
    2421e2a View commit details
    Browse the repository at this point in the history

  6. Merge pull request saltstack#48935 from garethgreenaway/1045_test_pkg… 

    …_015_installed_held_centos

[2017.7] Fix to test_pkg.test_pkg_015_installed_held
    Nicole Thomas committed Aug 5, 2018
    Configuration menu
    Copy the full SHA
    43649a6 View commit details
    Browse the repository at this point in the history

  7. Record all the artifacts from the build

    @KaiSforza
    KaiSforza authored and rallytime committed Aug 5, 2018
    Configuration menu
    Copy the full SHA
    fa4ef92 View commit details
    Browse the repository at this point in the history

  8. 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.
    rallytime committed Aug 5, 2018
    Configuration menu
    Copy the full SHA
    668da57 View commit details
    Browse the repository at this point in the history

  9. Merge pull request saltstack#48940 from rallytime/bp-48852 

    Back-port saltstack#48852 to 2017.7
    @gtmanfred
    gtmanfred committed Aug 5, 2018
    Configuration menu
    Copy the full SHA
    cd42510 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2018

  1. Merge pull request saltstack#48943 from rallytime/flaky-tests 

    Mark some shell and runner integration tests as flaky
    Nicole Thomas committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    928d688 View commit details
    Browse the repository at this point in the history

  2. Added a quote to kitchen Jenkinsfiles 

    Kitchen wasn't running correctly
    @KaiSforza
    KaiSforza committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    5242cb1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request saltstack#48950 from KaiSforza/kitchenfix-2017.7 

    Added a quote to kitchen Jenkinsfiles
    Nicole Thomas committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    848d583 View commit details
    Browse the repository at this point in the history

  4. Don't load service.py if minion is running a non-sysvinit init system 

    This keeps service.py from overriding systemd.py, among others.
    @terminalmage
    terminalmage committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    23f87bd View commit details
    Browse the repository at this point in the history

  5. Update salt.beacons.log to reflect that re module is used for matching. 

    As more non-python users are starting to use Salt, it would be useful to
point out which regular expression engines are in use so that users can
adapt accordingly.
    Thomas Phipps committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    a77fd16 View commit details
    Browse the repository at this point in the history

  6. Mark 2 matcher tests as flaky

    rallytime committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    e7e5abc View commit details
    Browse the repository at this point in the history

  7. Merge pull request saltstack#48955 from terminalmage/service-systemd 

    Don't load service.py if minion is running a non-sysvinit init system
    Nicole Thomas committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    0245cff View commit details
    Browse the repository at this point in the history

  8. Mark one grains test as flaky & convert to pytest notation

    rallytime committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    aaf986d View commit details
    Browse the repository at this point in the history

  9. Multiple block replace test fixes

    @dwoz
    dwoz committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    94ac2b4 View commit details
    Browse the repository at this point in the history

  10. Merge pull request saltstack#48957 from whytewolf/beacons_log_doc_change 

    Update salt.beacons.log to reflect that re module is used for matching.
    Nicole Thomas committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    93b862f View commit details
    Browse the repository at this point in the history

  11. Update the elif block to only be true for versions below Debian 9.

    @garethgreenaway
    garethgreenaway committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    9e71551 View commit details
    Browse the repository at this point in the history

  12. Merge pull request saltstack#48960 from dwoz/block_replace_tests 

    Multiple block replace test fixes
    @dwoz
    dwoz committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    1a1bda0 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2018

  1. Merge pull request saltstack#48962 from garethgreenaway/1022_test_ser… 

    …vice_disable_debian_part_deux

[2017.7] Fixing tests/integration/modules/test_service.py
    Nicole Thomas committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    79994ec View commit details
    Browse the repository at this point in the history

  2. Update man pages for 2017.7.8 release

    rallytime committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    64fe3be View commit details
    Browse the repository at this point in the history

  3. Update the elif block to only be true for versions below Debian 9.

    @garethgreenaway @Ch3LL
    garethgreenaway authored and Ch3LL committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    3ce1b8a View commit details
    Browse the repository at this point in the history

  4. Merge pull request saltstack#48968 from rallytime/man-pages 

    Update man pages for 2017.7.8 release
    Nicole Thomas committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    e6cea5e View commit details
    Browse the repository at this point in the history

  5. Merge pull request saltstack#48970 from Ch3LL/back_48962 

    [2017.7.8] Backport saltstack#48962
    Nicole Thomas committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    03aa0e4 View commit details
    Browse the repository at this point in the history

  6. 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.
    rallytime committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    0bd838a View commit details
    Browse the repository at this point in the history

  7. 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
    @gtmanfred
    gtmanfred committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    6108363 View commit details
    Browse the repository at this point in the history

  8. Merge pull request saltstack#48959 from rallytime/flaky-tests 

    Mark some more tests as flaky
    Nicole Thomas committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    5b2423e View commit details
    Browse the repository at this point in the history

  9. Merge pull request saltstack#48979 from rallytime/bp-48959 

    Back-port saltstack#48959 to 2017.7.8
    Nicole Thomas committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    22713be View commit details
    Browse the repository at this point in the history

  10. Merge pull request saltstack#48976 from rallytime/tornado 

    Skip unreliable tornado tests
    Nicole Thomas committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    a1e5463 View commit details
    Browse the repository at this point in the history

  11. Merge pull request saltstack#48978 from gtmanfred/2017.7 

    clean up gemfile
    @gtmanfred
    gtmanfred committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    10fd466 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2018

  1. Merge branch '2017.7.8' into '2017.7' 

    No conflicts.
    rallytime committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    df8699e View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#48988 from rallytime/merge-2017.7 

    [2017.7] Merge forward from 2017.7.8 to 2017.7
    Nicole Thomas committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    51eed1f View commit details
    Browse the repository at this point in the history

  3. 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.
    rallytime committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    1a23bb2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request saltstack#49003 from rallytime/boto-test-2017.7 

    Back-port saltstack#48999 to 2017.7
    Nicole Thomas committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    b49eeca View commit details
    Browse the repository at this point in the history

  5. 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
    rallytime committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    3e6445a View commit details
    Browse the repository at this point in the history

  6. Update old utils paths to use new paths

    rallytime committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    fceb6d8 View commit details
    Browse the repository at this point in the history

  7. Mark orchestration test as expensive

    rallytime committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    c26fa0d View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2018

  1. Revert "add key-deploy test" 

    This reverts commit 5b443af.
    rallytime committed Aug 9, 2018
    Configuration menu
    Copy the full SHA
    00416d5 View commit details
    Browse the repository at this point in the history

  2. 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 committed Aug 9, 2018
    Configuration menu
    Copy the full SHA
    7e1f791 View commit details
    Browse the repository at this point in the history

  3. Apply fix to ssh init file that was there before merge

    rallytime committed Aug 9, 2018
    Configuration menu
    Copy the full SHA
    0267096 View commit details
    Browse the repository at this point in the history