Merge branch 'develop' into avoid-checking-root-when-children_only-sp…

…ecified-in-file-directory

.ci/lint

@@ -98,7 +98,7 @@ pipeline {
         stage('linting all') {
             // perform a full linit if this is a merge forward and the change only lint passed.
             when {
-                expression { return params.CHANGE_BRANCH =~ /(?i)^merge[._-]/ }
+                expression { return env.CHANGE_BRANCH =~ /(?i)^merge[._-]/ }
             }
             parallel {
                 stage('setup full') {

.codecov.yml

@@ -0,0 +1,49 @@
+codecov:
+  ci:
+    - drone.saltstack.com
+    - jenkinsci.saltstack.com
+
+  branch: develop
+
+  notify:
+    require_ci_to_pass: no
+
+ignore:
+  - ^*.py$
+  - doc/.*
+  - tests/.*
+
+coverage:
+  round: up
+  range: 70..100
+  precision: 2
+
+  status:
+      project:                   # measuring the overall project coverage
+        default:
+          enabled: yes           # must be yes|true to enable this status
+          if_no_uploads: error   # will post commit status of "error" if no coverage reports we uploaded
+                                 # options: success, error, failure
+          if_not_found: success  # if parent is not found report status as success, error, or failure
+          if_ci_failed: success  # if ci fails report status as success, error, or failure
+
+      patch:                     # pull requests only: this commit status will measure the
+                                 # entire pull requests Coverage Diff. Checking if the lines
+                                 # adjusted are covered at least X%.
+        default:
+          enabled: no              # must be yes|true to enable this status
+          target: 80%              # specify the target "X%" coverage to hit
+          if_no_uploads: error     # will post commit status of "error" if no coverage reports we uploaded
+                                   # options: success, error, failure
+          if_not_found: success
+          if_ci_failed: success
+
+      changes:                   # if there are any unexpected changes in coverage
+        default:
+          enabled: no            # must be yes|true to enable this status
+          if_no_uploads: success
+          if_not_found: success
+          if_ci_failed: success
+
+# No commends because we're not yet running the full test suite on PRs
+comment: off

.coveragerc

@@ -0,0 +1,34 @@
+[run]
+branch = True
+cover_pylib = False
+source =
+  salt
+parallel = True
+concurrency = multiprocessing
+omit =
+  tests/*.py
+  setup.py
+
+[report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain about missing debug-only code:
+    def __repr__
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise AssertionError
+    raise NotImplementedError
+
+    # Don't complain if non-runnable code isn't run:
+    if 0:
+    if __name__ == .__main__.:
+
+
+ignore_errors = True
+
+[paths]
+source =
+   salt

Gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 
 gem 'test-kitchen', '~>1.23.3'
-gem 'kitchen-salt', '~>0.2'
+gem 'kitchen-salt', '~>0.4.1'
 gem 'kitchen-sync'
 gem 'git'
 
@@ -13,7 +13,7 @@ end
 
 group :windows do
   gem 'winrm', '~>2.0'
-  gem 'winrm-fs', '~>1.3.1' 
+  gem 'winrm-fs', '~>1.3.1'
 end
 
 group :ec2 do

Pipfile

@@ -21,7 +21,8 @@ boto3 = ">=1.2.1"
 moto = ">=0.3.6"
 SaltPyLint = ">=v2017.3.6"
 pytest = ">=4.0.1"
-pytest-salt = ">=2018.12.7"
+pytest-cov = "*"
+pytest-salt = "==2018.12.8"
 pytest-timeout = ">=1.3.3"
 pytest-tempdir = ">=2018.8.11"
 pytest-helpers-namespace = ">=2017.11.11"

README.rst

@@ -2,7 +2,7 @@
 What is SaltStack?
 ==================
 
-SaltStack makes software for complex systems management at scale.
+SaltStack makes software for complex systems management at scale.
 SaltStack is the company that created and maintains the Salt Open
 project and develops and sells SaltStack Enterprise software, services
 and support. Easy enough to get running in minutes, scalable enough to

conf/minion

@@ -33,7 +33,7 @@
 # and a warning will be logged.
 #random_master: False
 
-# NOTE: Deprecated in Salt Fluorine. Use 'random_master' instead.
+# NOTE: Deprecated in Salt 2019.2.0. Use 'random_master' instead.
 #master_shuffle: False
 
 # Minions can connect to multiple masters simultaneously (all masters
@@ -736,6 +736,9 @@
 # processes or threads. -1 is the default and disables the limit.
 #process_count_max: -1
 
+# If the process_count_max limit is reached, wait for this long in a coroutine before
+# attempting to launch the process for the next publication.
+#process_count_max_sleep_secs: 10
 
 #####         Logging settings       #####
 ##########################################