[pull] master from saltstack:master

.backportrc.json

@@ -0,0 +1,15 @@
+{
+  "repoOwner": "saltstack",
+  "repoName": "salt",
+  "targetBranchChoices": ["master", "3006.x", "3005.x", "freeze"],
+  "autoMerge": false,
+  "autoMergeMethod": "rebase",
+  "branchLabelMapping": {
+    "^backport:(.+)$": "$1"
+  },
+  "prTitle": "[BACKPORT] {commitMessages}",
+  "publishStatusCommentOnSuccess": true,
+  "sourcePRLabels": [
+    "backport:complete"
+  ]
+}

.codecov.yml

@@ -1,124 +1,94 @@
 codecov:
   ci:
-    - jenkinsci.saltstack.com
     - github.com
 
-  max_report_age: 24           # The age you want coverage reports to expire at, or if you
-                               # want to disable this check. Expired reports will not be processed by codecov.
-  require_ci_to_pass: yes      # Less spammy. Only notify on passing builds.
+  max_report_age: 72          # The age, in hours, you want coverage reports to expire at, or if you
+                              # want to disable this check. Expired reports will not be processed by codecov.
+  require_ci_to_pass: false
 
-
-#  notify:
-#    after_n_builds: 25           # Only notify after N builds
-#                                 # This value is the output of:
-#                                 #    sh -c 'echo "$(ls .ci/ | grep kitchen | wc -l)"'
-#    wait_for_ci: yes             # Should Codecov wait for all CI statuses to complete before sending ours.
-#                                 # Note: Codecov considers all non-codecov statues to be CI statuses
+  notify:
+    wait_for_ci: true         # Should Codecov wait for all CI statuses to complete before sending ours.
+                              # Note: Codecov considers all non-codecov statuses to be CI statuses
+#    manual_trigger: true      # We manually tell codecov to merge and process all uploaded coverage reports
 
 
 ignore:
-  - ^*.py$                       # python files at the repo root, ie, setup.py
-  - doc/.*                       # ignore any code under doc/
-  - salt/ext/.*                  # ignore any code under salt/ext
+  - ^*.py$                    # python files at the repo root, ie, setup.py
+  - doc/.*                    # ignore any code under doc/
+  - salt/ext/.*               # ignore any code under salt/ext
 
 coverage:
   round: up
   range: 70..100
   precision: 2
 
-  notify: {}
-  status: false
+  status:
+    project:
+      default:
+        target: auto          # auto compares coverage to the previous base commit
+        threshold: 5%         # adjust accordingly based on how flaky your tests are
+                              # this allows a 5% drop from the previous base commit coverage
+        flags:
+          - salt
+          - tests
 
-#  status:
-#      project:                   # measuring the overall project coverage
-#        default:
-#          informational: true    # Use Codecov in informational mode. Default is false. If true is specified the
-#                                 # resulting status will pass no matter what the coverage is or what other settings
-#                                 # are specified. Informational mode is great to use if you want to expose codecov
-#                                 # information to other developers in your pull request without necessarily gating
-#                                 # PRs on that information.
-#          target: auto           # will use the coverage from the base commit (pull request base or parent commit) coverage to compare against.
-#          base: auto             # will use the pull request base if the commit is on a pull request. If not, the parent commit will be used.
-#          flags:
-#            - salt
-#            - tests
-#        salt:                    # declare a new status context "salt"
-#          informational: true
-#          paths: "!tests/"       # remove all files in "tests/"
-#          target: auto           # will use the coverage from the base commit (pull request base or parent commit) coverage to compare against.
-#          base: auto             # will use the pull request base if the commit is on a pull request. If not, the parent commit will be used.
-#          if_no_uploads: error   # will post commit status of "error" if no coverage reports were uploaded
-#                                 # options: success, error, failure
-#          if_not_found: success  # if parent is not found report status as success, error, or failure
-#          if_ci_failed: error    # if ci fails report status as success, error, or failure
-#          flags:
-#            - salt
-#        tests:                   # declare a new status context "tests"
-#          informational: true
-#          #target: 100%          # we always want 100% coverage here
-#          target: auto           # auto while we get this going
-#          base: auto             # will use the pull request base if the commit is on a pull request. If not, the parent commit will be used.
-#          paths: "!salt/"        # only include coverage in "tests/" folder
-#          if_no_uploads: error   # will post commit status of "error" if no coverage reports were uploaded
-#                                 # options: success, error, failure
-#          if_not_found: success  # if parent is not found report status as success, error, or failure
-#          if_ci_failed: error    # if ci fails report status as success, error, or failure
-#          flags:
-#            - tests
+      salt:                   # declare a new status context "salt"
+        paths:
+          - "!tests/"         # remove all files in "tests/"
+        target: auto          # will use the coverage from the base commit (pull request base or parent commit) coverage to compare against.
+        flags:
+          - salt
 
-#      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:
-#          informational: true    # Use Codecov in informational mode. Default is false. If true is specified the
-#                                 # resulting status will pass no matter what the coverage is or what other settings
-#                                 # are specified. Informational mode is great to use if you want to expose codecov
-#                                 # information to other developers in your pull request without necessarily gating
-#                                 # PRs on that information.
-#          target: 100%           # Newly added lines must have 100% coverage
-#          if_no_uploads: error   # will post commit status of "error" if no coverage reports were uploaded
-#                                 # options: success, error, failure
-#          if_not_found: success
-#          if_ci_failed: error
-#          flags:
-#            - salt
-#            - tests
+      tests:                  # declare a new status context "tests"
+        paths:
+          - "!salt/"          # only include coverage in "tests/" folder
+        target: auto          # auto while we get this going
+        flags:
+          - tests
 
-#      changes:                   # if there are any unexpected changes in coverage
-#        default:
-#          informational: true    # Use Codecov in informational mode. Default is false. If true is specified the
-#                                 # resulting status will pass no matter what the coverage is or what other settings
-#                                 # are specified. Informational mode is great to use if you want to expose codecov
-#                                 # information to other developers in your pull request without necessarily gating
-#                                 # PRs on that information.
-#          if_no_uploads: error
-#          if_not_found: success
-#          if_ci_failed: error
-#          flags:
-#            - salt
-#            - tests
+    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:
+        target: auto          # auto compares coverage to the previous base commit
+        threshold: 5%         # adjust accordingly based on how flaky your tests are
+                              # this allows a 5% drop from the previous base commit coverage
 
 flags:
   salt:
     paths:
       - salt/
-    carryforward: true           # https://docs.codecov.io/docs/carryforward-flags
+    carryforward: false       # https://docs.codecov.io/docs/carryforward-flags
   tests:
     paths:
       - tests/
-    carryforward: true
+    carryforward: false
+  pkg:
+    paths:
+      - pkg/tests
+    carryforward: false
+  unit:
+    paths:
+      - tests/unit
+      - tests/pytests/unit
+    carryforward: false
+  functional:
+    paths:
+      - tests/pytests/functional
+    carryforward: false
+  scenarios:
+    paths:
+      - tests/pytests/scenarios
+    carryforward: false
+  integration:
+    paths:
+      - tests/integration
+      - tests/pytests/integration
+    carryforward: false
 
-#comment:
-#  layout: "reach, diff, flags, files"
-#  after_n_builds: 46             # Only comment on PRs after N builds
-#                                 # This value is the output of:
-#                                 #    sh -c 'echo "$(ls .ci/ | grep kitchen | wc -l)"'
-#
-#  behavior: new                  # Comment posting behaviour
-#                                 #   default: update, if exists. Otherwise post new.
-#                                 #   once: update, if exists. Otherwise post new. Skip if deleted.
-#                                 #   new: delete old and post new.
-#                                 #   spammy: post new (do not delete old comments).
-#
-# Disable Comments
-comment: off
+comment:
+  layout: "reach, diff, flags, files"
+  behavior: new                  # Comment posting behaviour
+                                 #   default: update, if exists. Otherwise post new.
+                                 #   once: update, if exists. Otherwise post new. Skip if deleted.
+                                 #   new: delete old and post new.

.coveragerc

@@ -4,9 +4,17 @@ cover_pylib = False
 parallel = True
 concurrency = multiprocessing
 relative_files = True
+dynamic_context = test_function
 omit =
   setup.py
   .nox/*
+source_pkgs =
+  pkg.tests
+  salt
+  tests
+  tools
+disable_warnings = module-not-imported
+
 
 [report]
 # Regexes for lines to exclude from consideration
@@ -32,16 +40,13 @@ ignore_errors = True
 [paths]
 salt =
   salt/
-  /tmp/kitchen/testing/salt/
-  /private/tmp/kitchen/testing/salt/
-  C:\Users\admini~1\AppData\Local\Temp\kitchen\testing\salt\
-  C:\Users\Administrator\AppData\Local\Temp\kitchen\testing\salt\
+  artifacts/salt/lib/python3.*/site-packages/salt
+  **/testing/salt/
+  **\testing\salt
 tests =
   tests/
-  /tmp/kitchen/testing/tests/
-  /private/tmp/kitchen/testing/tests/
-  C:\Users\admini~1\AppData\Local\Temp\kitchen\testing\tests\
-  C:\Users\Administrator\AppData\Local\Temp\kitchen\testing\tests\
+  **/testing/tests/
+  **\testing\tests
 extension_modules =
   tests/integration/files/extension_modules/
   */extension_modules/

.github/CODEOWNERS

@@ -9,58 +9,4 @@
 # This file uses an fnmatch-style matching pattern.
 
 # Team Core
-*                                   @saltstack/team-core
-
-# Team Boto
-salt/*/*boto*                       @saltstack/team-boto @saltstack/team-core
-
-# Team Cloud
-salt/cloud/*                        @saltstack/team-cloud @saltstack/team-core
-salt/utils/openstack/*              @saltstack/team-cloud @saltstack/team-core
-salt/utils/aws.py                   @saltstack/team-cloud @saltstack/team-core
-salt/*/*cloud*                      @saltstack/team-cloud @saltstack/team-core
-
-# Team NetAPI
-salt/cli/api.py                     @saltstack/team-netapi @saltstack/team-core
-salt/client/netapi.py               @saltstack/team-netapi @saltstack/team-core
-salt/netapi/*                       @saltstack/team-netapi @saltstack/team-core
-
-# Team Network
-salt/proxy/*                        @saltstack/team-proxy @saltstack/team-core
-
-# Team SPM
-salt/cli/spm.py                     @saltstack/team-spm @saltstack/team-core
-salt/spm/*                          @saltstack/team-spm @saltstack/team-core
-
-# Team SSH
-salt/cli/ssh.py                     @saltstack/team-ssh @saltstack/team-core
-salt/client/ssh/*                   @saltstack/team-ssh @saltstack/team-core
-salt/roster/*                       @saltstack/team-ssh @saltstack/team-core
-salt/runners/ssh.py                 @saltstack/team-ssh @saltstack/team-core
-salt/*/thin.py                      @saltstack/team-ssh @saltstack/team-core
-
-# Team State
-salt/state.py                       @saltstack/team-state @saltstack/team-core
-
-# Team SUSE
-salt/*/*btrfs*                      @saltstack/team-suse @saltstack/team-core
-salt/*/*kubernetes*                 @saltstack/team-suse @saltstack/team-core
-salt/*/*pkg*                        @saltstack/team-suse @saltstack/team-core
-salt/*/*snapper*                    @saltstack/team-suse @saltstack/team-core
-salt/*/*xfs*                        @saltstack/team-suse @saltstack/team-core
-salt/*/*zypper*                     @saltstack/team-suse @saltstack/team-core
-
-# Team Transport
-salt/transport/*                    @saltstack/team-transport @saltstack/team-core
-salt/utils/zeromq.py                @saltstack/team-transport @saltstack/team-core
-
-# Team Windows
-salt/*/*win*                        @saltstack/team-windows @saltstack/team-core
-salt/modules/reg.py                 @saltstack/team-windows @saltstack/team-core
-salt/states/reg.py                  @saltstack/team-windows @saltstack/team-core
-tests/*/*win*                       @saltstack/team-windows @saltstack/team-core
-tests/*/test_reg.py                 @saltstack/team-windows @saltstack/team-core
-tests/pytests/*                     @saltstack/team-code @s0undt3ch
-
-# Jenkins Integration
-.ci/*                               @saltstack/saltstack-sre-team @saltstack/team-core
+*                                   @saltstack/salt-core-maintainers