[develop] Merge forward from fluorine to develop #50973
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This keeps us from needing to manually clean them up in the tearDown
On the road to saltstack#32245.
2018-12-06 11:57:11,495 [salt.utils.gitfs :2341][ERROR ][866] Exception caught while fetching gitfs remote '__env__ https://git.example.org/somerepo.git': 'ascii' codec can't decode byte 0xc3 in position 0: ordinal not in range(128) Traceback (most recent call last): File "/usr/lib/python2.7/dist-packages/salt/utils/gitfs.py", line 2329, in fetch_remotes if repo.fetch(): File "/usr/lib/python2.7/dist-packages/salt/utils/gitfs.py", line 757, in fetch return self._fetch() File "/usr/lib/python2.7/dist-packages/salt/utils/gitfs.py", line 1271, in _fetch cleaned = self.clean_stale_refs() File "/usr/lib/python2.7/dist-packages/salt/utils/gitfs.py", line 605, in clean_stale_refs if line.startswith(marker): UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 0: ordinal not in range(128) The environement variables are not sanitized, and as we use LANG=fr_FR.utf8. Calling the same command prints non-ascii: root@salt-master:/var/cache/salt/master/git_pillar/51958f355141ebce331e186a5230c20f2d0264025054eeb2fc2c5b3b81ab53a0# git remote prune origin Élimination de origin URL : https://git.example.org/somerepo.git * [éliminé] origin/toto Inspired by https://github.com/gitpython-developers/GitPython/blob/a8591a094a768d73e6efb5a698f74d354c989291/git/cmd.py#L694
The _changes method was not properlt reporting mindays, maxdays, inactdays and warndays values
Conflicts: - salt/templates/debian_ip/debian_eth.jinja
- Updated debian-based distro comment - Fixed example of configuring a loopback device - Cleaned up copy/paste mistakes - Added more examples - Verified examples work on Debian 9
Back-port saltstack#49355 to 2018.3
Fix saltstack#48801 min, max, inact, and warn changes
git_pillar: Add support for all_saltenvs parameter
Update a couple test modules to use with_tempdir/with_tempfile decorators
Fix icinga2 cert path
Let minions try to connect to master indefinitly
Libvirt events algorigthm converting the libvirt enums into string has a flaw that unit tests couldn't see. Libvirt python binding defines the following constants: VIR_DOMAIN_EVENT_CRASHED_PANICKED = 0 VIR_DOMAIN_EVENT_DEFINED = 0 VIR_DOMAIN_EVENT_CRASHED = 8 However VIR_DOMAIN_EVENT_CRASHED_PANICKED is the only value in this enum and thus wasn't not considered a sub-enum element. So the value 0 in enum 'VIR_DOMAIN_EVENT_' was wrongly mapped to "crashed panicked" instead of "defined". In order to safely rule this case out, check if we have an item that just ends with the subprefix without the '_'.
Setting the <memory> element in the libvirt definition just changes the maximum amount of memory. Also set the <currentMemory> amount to the same value.
Fix unused variable in _domain_event_graphics_cb.
Misc virt fixes
Increase and standardize ShellCase timeouts
Do not pass unicode in environment
Fix `test_debian_ip` on Windows
These should have been failing across the board. I don't know what's going on with the tests suite
saltstack#50924: Check if running a NAPALM Proxy or regular Minion
Fix `unit.utils.test_lgpo_netsh` on Windows for Py3
Conflicts: salt/modules/win_lgpo.py salt/templates/debian_ip/debian_eth.jinja tests/unit/modules/test_debian_ip.py
|
At a glance, it looks like @Ch3LL is right and there was a legitimate test
failure, but it could be because I wrote two sets of tests and one was much
better than the other.
Digging into this sounds like an unpleasant challenge... partly because it
seems like there's a whole lot of movement in a few directions and this
kinda thing is unfamiliar territory.
You mentioned the Debian template, but I don't see that file listed in the
merge. Is that because of the conflicts?
To reproduce this issue, should I be able to clone your branch and attempt
a simple merge from develop?
… |
|
@MTecknology In a previous merge-forward attempt there was a conflict with the template and I thought there was gong to be in this one as well, looks like it's all good now though so you can ignore that message for now :) The failing test I have an idea why it's failing and the fix, still need to push that up. |
|
Excellent! I love hearing that someone else is fixing things!! :P
If you run into troubles, I should have some time this week to help dig in.
|
…on, otherwise minion_blackout pillar value is left behind for the sub_minion.
dwoz
approved these changes
Dec 30, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge branch 'fluorine' into develop
Conflicts: