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

[2019.2] Merge forward from 2018.3 to 2019.2 #52528

Merged
merged 56 commits into from Apr 17, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Apr 12, 2019

Conflicts:

  • tests/unit/transport/test_ipc.py
twangboy and others added 30 commits Mar 7, 2019
Reverts PR 51095
Checks for null characters
Rather than using `grains.items`, `test.arg` is less common, and
specifiying a value that isn't currently used anywhere else should
eliminate any chance of race condition for this test.
David Murphy
Since refresh_db is a costly operation we should have the option of not calling that

Signed-off-by: Cristian Hotea <cristian.hotea@ni.com>
Pygit2 version 0.26.2 added support for pruning when fetching.
In this way Pygit2 provider will no longer need to leverage
git commanand line utility for pruning the remote.

Signed-off-by: Cristian Hotea <cristian.hotea@ni.com>
Pkgrepo state module is using a named argument when calling pkg.del_repo.
Change the name of the argument from 'alias' to 'repo' and update all
other functions to be consistent on naming.

Signed-off-by: Cristian Hotea <cristian.hotea@ni.com>
python exposes an nt.environ for case insensitive environment behavior
that is native to windows; so it makes sense to use this instead of
os.environ to avoid enexpected behavior and failure.

further detail: https://bugs.python.org/issue28824
Simplify IPCClient and prevent corrupt messages
…ents

Use uncommon item in mine delete test
Backport #49984 into 2018.3
2018.3 backport #52472 modules.cmdmod: handle windows environ better
When the source is procedurally generated (e.g. from the result of a
remote execution function call), and that source ends up being an empty
string or some other invalid value, the call to `file.source_list` will
return a path of `None` which will cause a `TypeError` later on when we
try to run a urlparse on it.
Ch3LL and others added 15 commits Apr 11, 2019
Prefix any output with ERROR on non 0 exit code because that's what the
supervisord state checks for.
Backport #49464 into 2018.3
[2018.3] Fix supervisord
2018.3: transport.zmq: fix bug introduced by b7df7e7
Fix ping reaction test
Backport #49437 into 2018.3
Altered code to support salt-ssh on AIX
Use registry to get timezone
Handle Chocolatey's new Enhanced Exit Codes
Conflicts:
  - tests/unit/transport/test_ipc.py
Ch3LL added 3 commits Apr 12, 2019
@codecov

This comment has been minimized.

Copy link

commented Apr 13, 2019

Codecov Report

❗️ No coverage uploaded for pull request base (2019.2@2c42e4d). Click here to learn what that means.
The diff coverage is 56.31%.

Impacted file tree graph

@@            Coverage Diff            @@
##             2019.2   #52528   +/-   ##
=========================================
  Coverage          ?   48.97%           
=========================================
  Files             ?     1511           
  Lines             ?   256900           
  Branches          ?    55634           
=========================================
  Hits              ?   125812           
  Misses            ?   130791           
  Partials          ?      297
Flag Coverage Δ
#arch 0.72% <11.65%> (?)
#debian8 45.43% <44.66%> (?)
#fedora29 30.29% <31.06%> (?)
#m2crypto 45.46% <50.48%> (?)
#opensuse42 32.28% <27.18%> (?)
#py2 32.57% <33.98%> (?)
#py3 32.65% <31.06%> (?)
#ubuntu1604 45.46% <50.48%> (?)
#windows2019 0% <0%> (?)
Impacted Files Coverage Δ
salt/utils/gitfs.py 64.69% <100%> (ø)
salt/modules/chocolatey.py 39.79% <100%> (ø)
salt/modules/win_timezone.py 78.48% <100%> (ø)
salt/client/ssh/ssh_py_shim.py 18.75% <100%> (ø)
salt/states/archive.py 48.19% <25%> (ø)
salt/utils/rsax931.py 89.77% <33.33%> (ø)
salt/modules/cmdmod.py 55.58% <37.5%> (ø)
salt/transport/ipc.py 59.83% <46.66%> (ø)
salt/transport/zeromq.py 65.45% <50%> (ø)
salt/modules/opkg.py 35.71% <53.33%> (ø)
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2c42e4d...048a82e. Read the comment docs.

1 similar comment
@codecov

This comment has been minimized.

Copy link

commented Apr 13, 2019

Codecov Report

❗️ No coverage uploaded for pull request base (2019.2@2c42e4d). Click here to learn what that means.
The diff coverage is 56.31%.

Impacted file tree graph

@@            Coverage Diff            @@
##             2019.2   #52528   +/-   ##
=========================================
  Coverage          ?   48.97%           
=========================================
  Files             ?     1511           
  Lines             ?   256900           
  Branches          ?    55634           
=========================================
  Hits              ?   125812           
  Misses            ?   130791           
  Partials          ?      297
Flag Coverage Δ
#arch 0.72% <11.65%> (?)
#debian8 45.43% <44.66%> (?)
#fedora29 30.29% <31.06%> (?)
#m2crypto 45.46% <50.48%> (?)
#opensuse42 32.28% <27.18%> (?)
#py2 32.57% <33.98%> (?)
#py3 32.65% <31.06%> (?)
#ubuntu1604 45.46% <50.48%> (?)
#windows2019 0% <0%> (?)
Impacted Files Coverage Δ
salt/utils/gitfs.py 64.69% <100%> (ø)
salt/modules/chocolatey.py 39.79% <100%> (ø)
salt/modules/win_timezone.py 78.48% <100%> (ø)
salt/client/ssh/ssh_py_shim.py 18.75% <100%> (ø)
salt/states/archive.py 48.19% <25%> (ø)
salt/utils/rsax931.py 89.77% <33.33%> (ø)
salt/modules/cmdmod.py 55.58% <37.5%> (ø)
salt/transport/ipc.py 59.83% <46.66%> (ø)
salt/transport/zeromq.py 65.45% <50%> (ø)
salt/modules/opkg.py 35.71% <53.33%> (ø)
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2c42e4d...048a82e. Read the comment docs.

Ch3LL added 4 commits Apr 15, 2019
@dwoz
dwoz approved these changes Apr 17, 2019
Copy link
Contributor

left a comment

We don't want to merge with failing tests but these Windows PY3 tests are failing sporadically. We're going to tackle these after the first branch builds run on 2019.2.1

@dwoz dwoz merged commit cc0cd5d into saltstack:2019.2 Apr 17, 2019
8 of 10 checks passed
8 of 10 checks passed
continuous-integration/jenkins/pr-merge This commit is being built
Details
jenkins/pr/py3-windows-2016 running py3-windows-2016...
Details
WIP Ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test 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/py2-windows-2016 The py2-windows-2016 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
@Ch3LL Ch3LL deleted the Ch3LL:merge-2019.2 branch Apr 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
10 participants
You can’t perform that action at this time.