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

Merge 3002.6 bugfix changes #59822

Merged
merged 32 commits into from
Mar 18, 2021
Merged

Merge 3002.6 bugfix changes #59822

merged 32 commits into from
Mar 18, 2021

Commits on Mar 9, 2021

  1. Pass CI_RUN as an environment variable to the test run. 

    This allows us to know if we're running the test suite under a CI
environment or not and adapt/adjust if needed
    @s0undt3ch @Ch3LL
    s0undt3ch authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    a0db8ff View commit details
    Browse the repository at this point in the history

  2. Migrate unit.setup to PyTest

    @s0undt3ch @Ch3LL
    s0undt3ch authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    2a49ed0 View commit details
    Browse the repository at this point in the history

  3. Backport ae36b15 just for test_install.py

    @Ch3LL
    Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    9caee9e View commit details
    Browse the repository at this point in the history

  4. Only skip tests on CI runs

    @s0undt3ch @Ch3LL
    s0undt3ch authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    4091432 View commit details
    Browse the repository at this point in the history

  5. Always store git sha in _version.py during installation

    @Ch3LL
    Bryce Larson authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    65e23aa View commit details
    Browse the repository at this point in the history

  6. Fix PEP440 compliance. 

    The wheel metadata version 1.2 states that the package version MUST be
PEP440 compliant.

This means that instead of `3002.2-511-g033c53eccb`, the salt version
string should look like `3002.2+511.g033c53eccb`, a post release of
`3002.2` ahead by 511 commits with the git sha `033c53eccb`
    @s0undt3ch @Ch3LL
    s0undt3ch authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    1287495 View commit details
    Browse the repository at this point in the history

  7. Fix and migrate tests/unit/test_version.py to PyTest

    @s0undt3ch @Ch3LL
    s0undt3ch authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    dddcba1 View commit details
    Browse the repository at this point in the history

  8. Skip test if easy_install is not available

    @s0undt3ch @Ch3LL
    s0undt3ch authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    8d5454c View commit details
    Browse the repository at this point in the history

  9. We also need to be PEP440 compliant when there's no git history

    @s0undt3ch @Ch3LL
    s0undt3ch authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    b783b47 View commit details
    Browse the repository at this point in the history

  10. Merge pull request saltstack#193 from Ch3LL/3002.6_test_install 

    [3002.6] Fixes unit.setup.test_install.InstallTest.test_sdist
    @Ch3LL
    Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    1803fd5 View commit details
    Browse the repository at this point in the history

  11. Allow extra_filerefs as sanitized kwargs for SSH client

    @meaksh @Ch3LL
    meaksh authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    28207d0 View commit details
    Browse the repository at this point in the history

  12. Fix regression on cmd.run when passing tuples as cmd 

    Co-authored-by: Alexander Graul <agraul@suse.com>
    @meaksh @agraul @Ch3LL
    2 people authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    071945f View commit details
    Browse the repository at this point in the history

  13. Add unit tests to ensure cmd.run accepts tuples

    @meaksh @Ch3LL
    meaksh authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    7e2253c View commit details
    Browse the repository at this point in the history

  14. Add unit test to check for extra_filerefs on SSH opts

    @meaksh @Ch3LL
    meaksh authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    fcfec17 View commit details
    Browse the repository at this point in the history

  15. Add changelog file

    @meaksh @Ch3LL
    meaksh authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    6aa84d3 View commit details
    Browse the repository at this point in the history

  16. Fix comment for test case

    @meaksh @Ch3LL
    meaksh authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    5aae74e View commit details
    Browse the repository at this point in the history

  17. Fix unit test to avoid failing on Windows

    @meaksh @Ch3LL
    meaksh authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    25a4567 View commit details
    Browse the repository at this point in the history

  18. Skip failing test on windows

    @meaksh @Ch3LL
    meaksh authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    9388d5e View commit details
    Browse the repository at this point in the history

  19. Fix test to work on Windows

    @meaksh @Ch3LL
    meaksh authored and Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    c1488cf View commit details
    Browse the repository at this point in the history

  20. Add all ssh kwargs to sanitize_kwargs method

    @Ch3LL
    Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    61d74a7 View commit details
    Browse the repository at this point in the history

  21. Run pre-commit

    @Ch3LL
    Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    447cc4b View commit details
    Browse the repository at this point in the history

  22. Fix pylint

    @Ch3LL
    Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    ba6e399 View commit details
    Browse the repository at this point in the history

  23. Fix cmdmod loglevel and module_names tests

    @Ch3LL
    Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    1fae89d View commit details
    Browse the repository at this point in the history

  24. Fix pre-commit

    @Ch3LL
    Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    1a6a2ea View commit details
    Browse the repository at this point in the history

  25. Skip ssh tests if binary does not exist

    @Ch3LL
    Ch3LL committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    149153a View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2021

  1. Use setup_loader for cmdmod test

    @Ch3LL
    Ch3LL committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    355fbc2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#190 from Ch3LL/3002.6_ssh_kwargs 

    [3002.6] Backport saltstack#59664 saltstack#59748
    @Ch3LL
    Ch3LL committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    4202798 View commit details
    Browse the repository at this point in the history

  3. Prevent argument injection in restartcheck

    @dwoz
    dwoz committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    777ffe6 View commit details
    Browse the repository at this point in the history

  4. Add changelog for restartcheck fix

    @dwoz
    dwoz committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    903cfdc View commit details
    Browse the repository at this point in the history

  5. docs_3002.6

    @dwoz
    Frode Gundersen authored and dwoz committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    027263b View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2021

  1. Merge branch '3002.6' into merge/3002.6/freeze

    @dwoz
    dwoz committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    d53ba5e View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2021

  1. Add back tests removed in merge

    @dwoz
    dwoz committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    2453064 View commit details
    Browse the repository at this point in the history