[develop] Merge forward from fluorine to develop #49849
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 allows us to properly clean out the workspace before a job run.
Fix test opts in append, prepend states/file.py
Move all pipelines to be fully scripted
No conflicts.
via salt-run cli a jid is generated in RunnerClient via gen_async_pub and passed on via orchestration_jid if the func is orchestration, but in other callsites this jid generation doesn't happen (ie, the netapi client, since it directly invokes AsyncMixins.cmd_sync). There seems to be no obvious way to correct this at the netapi level so we just default to a new jid if orch_jid is missing. there may be other calling contexts where this could have been occurring.
…s and some other lint fixes for this file
Fix the new pipelines
No conflicts.
Back-port saltstack#49759 to 2018.3
1. Non-ascii was causing a UnicodeDecodeError when matching 2. Matching a dict value after a wildcard (i.e. the key is the wildcard) did not work. This is because it was matching the pattern against the key, instead of the value as it should have. 3. It was not possible to use a wildcard for the first level of matching.
fix test_managed_file_with_grains_data
Bugfix: zypper ZYPPER_EXIT_NO_REPOS exit code
This cannot be detected with type comparison, because bytes == str and at the same time bytes != str if compatibility is not around
…dress object instance
[2018.3] Merge forward from 2017.7 to 2018.3
…o hang The test suite is hanging on this test. We need to skip it until we can look into this further.
Back-port saltstack#49824 to fluorine
…018.3 Bugfix/rework: IPv6 scope errors (bp)
Adding timeout to all pipelines so that the build aborts
No conflicts.
[2018.3] Merge forward from 2017.7 to 2018.3
Conflicts: - salt/minion.py - salt/utils/data.py
[fluorine] Merge forward from 2018.3 to fluorine
Conflicts: - salt/cloud/clouds/saltify.py - salt/modules/network.py - tests/unit/modules/test_network.py
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.
Conflicts: