Merge branch 'master' of https://github.com/saltstack/salt into maste…

…r_thread_safe_loader
saltstack · Apr 24, 2020 · 0fba841 · 0fba841
2 parents 32f2f46 + 0a56079
commit 0fba841
Show file tree

Hide file tree

Showing 3,065 changed files with 464,830 additions and 374,575 deletions.
diff --git a/.ci/docs b/.ci/docs
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runDocs(
     env: env)

diff --git a/.ci/kitchen-amazon1-py2 b/.ci/kitchen-amazon1-py2
diff --git a/.ci/kitchen-amazon2-py2 b/.ci/kitchen-amazon2-py2
diff --git a/.ci/kitchen-amazon2-py3 b/.ci/kitchen-amazon2-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-archlts-py2 b/.ci/kitchen-archlts-py2
diff --git a/.ci/kitchen-archlts-py3 b/.ci/kitchen-archlts-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-centos6-py2 b/.ci/kitchen-centos6-py2
diff --git a/.ci/kitchen-centos7-py2-cloud b/.ci/kitchen-centos7-py2-cloud
diff --git a/.ci/kitchen-centos7-py2-m2crypto b/.ci/kitchen-centos7-py2-m2crypto
diff --git a/.ci/kitchen-centos7-py2-proxy b/.ci/kitchen-centos7-py2-proxy
diff --git a/.ci/kitchen-centos7-py2-pycryptodomex b/.ci/kitchen-centos7-py2-pycryptodomex
diff --git a/.ci/kitchen-centos7-py2-tcp b/.ci/kitchen-centos7-py2-tcp
diff --git a/.ci/kitchen-centos7-py2-tornado b/.ci/kitchen-centos7-py2-tornado
diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-centos7-py3-cloud b/.ci/kitchen-centos7-py3-cloud
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 0,

diff --git a/.ci/kitchen-centos7-py3-m2crypto b/.ci/kitchen-centos7-py3-m2crypto
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-centos7-py3-proxy b/.ci/kitchen-centos7-py3-proxy
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-centos7-py2 → .ci/kitchen-centos7-py3-pycryptodome b/.ci/kitchen-centos7-py2 → .ci/kitchen-centos7-py3-pycryptodome
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,
@@ -7,9 +7,9 @@ runTestSuite(
     env: env,
     golden_images_branch: 'master',
     jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'runtests-zeromq',
+    nox_env_name: 'runtests-zeromq-pycryptodome',
     nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py2',
+    python_version: 'py3',
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos7-py3-pycryptodomex b/.ci/kitchen-centos7-py3-pycryptodomex
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,
@@ -7,7 +7,7 @@ runTestSuite(
     env: env,
     golden_images_branch: 'master',
     jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'runtests-zeromq-pycryptodomex',
+    nox_env_name: 'runtests-zeromq-pycryptodome',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py3',
     testrun_timeout: 6,

diff --git a/.ci/kitchen-centos7-py3-tcp b/.ci/kitchen-centos7-py3-tcp
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-centos8-py3 b/.ci/kitchen-centos8-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-debian10-py3 b/.ci/kitchen-debian10-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-debian8-py2 b/.ci/kitchen-debian8-py2
diff --git a/.ci/kitchen-debian9-py2 b/.ci/kitchen-debian9-py2
diff --git a/.ci/kitchen-debian9-py3 b/.ci/kitchen-debian9-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-fedora30-py2 b/.ci/kitchen-fedora30-py2
diff --git a/.ci/kitchen-fedora30-py3 b/.ci/kitchen-fedora30-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-fedora31-py3 b/.ci/kitchen-fedora31-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-macosxhighsierra-py2 b/.ci/kitchen-macosxhighsierra-py2
diff --git a/.ci/kitchen-macosxhighsierra-py3 b/.ci/kitchen-macosxhighsierra-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 // Pre-nox pipeline
 runTestSuite(
@@ -11,7 +11,7 @@ runTestSuite(
     kitchen_platforms_file: '/var/jenkins/workspace/pre-golden-nox-platforms.yml',
     kitchen_verifier_file: '/var/jenkins/workspace/nox-verifier.yml',
     nox_env_name: 'runtests-zeromq',
-    nox_passthrough_opts: '',
+    nox_passthrough_opts: '--ssh-tests',
     python_version: 'py3',
     run_full: params.runFull,
     testrun_timeout: 6,

diff --git a/.ci/kitchen-macosxmojave-py2 b/.ci/kitchen-macosxmojave-py2