Merge branch 'master' into gitfs_file_cache_perf_logging

saltstack · Dec 2, 2019 · bf14def · bf14def
2 parents 515a3e2 + 0fc2b3d
commit bf14def
Show file tree

Hide file tree

Showing 184 changed files with 2,883 additions and 2,654 deletions.
diff --git a/.ci/kitchen-amazon1-py2 b/.ci/kitchen-amazon1-py2
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py2',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-amazon2-py2 b/.ci/kitchen-amazon2-py2
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py2',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-amazon2-py3 b/.ci/kitchen-amazon2-py3
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py3',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-archlts-py2 b/.ci/kitchen-archlts-py2
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '-n integration.modules.test_pkg',
     python_version: 'py2',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-archlts-py3 b/.ci/kitchen-archlts-py3
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '-n integration.modules.test_pkg',
     python_version: 'py3',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos6-py2 b/.ci/kitchen-centos6-py2
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py2',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos7-py2 b/.ci/kitchen-centos7-py2
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py2',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos7-py2-cloud b/.ci/kitchen-centos7-py2-cloud
@@ -8,10 +8,9 @@ runTestSuite(
     golden_images_branch: 'master',
     jenkins_slave_label: 'kitchen-slave',
     kitchen_platforms_file: '/var/jenkins/workspace/nox-cloud-platforms.yml',
-    nox_env_name: 'runtests-zeromq',
+    nox_env_name: 'runtests-cloud',
     nox_passthrough_opts: '',
     python_version: 'py2',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos7-py2-m2crypto b/.ci/kitchen-centos7-py2-m2crypto
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq-m2crypto',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py2',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos7-py2-proxy b/.ci/kitchen-centos7-py2-proxy
@@ -11,7 +11,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--proxy',
     python_version: 'py2',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos7-py2-pycryptodomex b/.ci/kitchen-centos7-py2-pycryptodomex
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq-pycryptodomex',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py2',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos7-py2-tcp b/.ci/kitchen-centos7-py2-tcp
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-tcp',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py2',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos7-py2-tornado b/.ci/kitchen-centos7-py2-tornado
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-tornado',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py2',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py3',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos7-py3-cloud b/.ci/kitchen-centos7-py3-cloud
@@ -8,10 +8,9 @@ runTestSuite(
     golden_images_branch: 'master',
     jenkins_slave_label: 'kitchen-slave',
     kitchen_platforms_file: '/var/jenkins/workspace/nox-cloud-platforms.yml',
-    nox_env_name: 'runtests-zeromq',
+    nox_env_name: 'runtests-cloud',
     nox_passthrough_opts: '',
     python_version: 'py3',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos7-py3-m2crypto b/.ci/kitchen-centos7-py3-m2crypto
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq-m2crypto',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py3',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos7-py3-proxy b/.ci/kitchen-centos7-py3-proxy
@@ -11,7 +11,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--proxy',
     python_version: 'py3',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos7-py3-pycryptodomex b/.ci/kitchen-centos7-py3-pycryptodomex
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq-pycryptodomex',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py3',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos7-py3-tcp b/.ci/kitchen-centos7-py3-tcp
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-tcp',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py3',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-centos8-py3 b/.ci/kitchen-centos8-py3
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py3',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-debian10-py3 b/.ci/kitchen-debian10-py3
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py3',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-debian8-py2 b/.ci/kitchen-debian8-py2
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py2',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-debian9-py2 b/.ci/kitchen-debian9-py2
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py2',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-debian9-py3 b/.ci/kitchen-debian9-py3
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py3',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-fedora30-py2 b/.ci/kitchen-fedora30-py2
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py2',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-fedora30-py3 b/.ci/kitchen-fedora30-py3
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py3',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)
 

diff --git a/.ci/kitchen-fedora31-py3 b/.ci/kitchen-fedora31-py3
@@ -10,7 +10,6 @@ runTestSuite(
     nox_env_name: 'runtests-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py3',
-    run_full: params.runFull,
     testrun_timeout: 6,
     use_spot_instances: true)