Skip to content

Commit 7fde744

Browse files
s0undt3chs0undt3ch
authored
Merge branch 'master' into less_flaky
2 parents 4e84c79 + cc91391 commit 7fde744

File tree

113 files changed

+555
-1232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+555
-1232
lines changed

‎.ci/kitchen-amazon1-py2

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py2',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-amazon2-py2

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py2',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-amazon2-py3

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py3',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-archlts-py2

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '-n integration.modules.test_pkg',
1212
python_version: 'py2',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-archlts-py3

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '-n integration.modules.test_pkg',
1212
python_version: 'py3',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-centos6-py2

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py2',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-centos7-py2

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py2',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-centos7-py2-cloud

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ runTestSuite(
88
golden_images_branch: 'master',
99
jenkins_slave_label: 'kitchen-slave',
1010
kitchen_platforms_file: '/var/jenkins/workspace/nox-cloud-platforms.yml',
11-
nox_env_name: 'runtests-zeromq',
11+
nox_env_name: 'runtests-cloud',
1212
nox_passthrough_opts: '',
1313
python_version: 'py2',
14-
run_full: params.runFull,
1514
testrun_timeout: 6,
1615
use_spot_instances: true)
1716

‎.ci/kitchen-centos7-py2-m2crypto

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq-m2crypto',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py2',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-centos7-py2-proxy

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ runTestSuite(
1111
nox_env_name: 'runtests-zeromq',
1212
nox_passthrough_opts: '--proxy',
1313
python_version: 'py2',
14-
run_full: params.runFull,
1514
testrun_timeout: 6,
1615
use_spot_instances: true)
1716

‎.ci/kitchen-centos7-py2-pycryptodomex

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq-pycryptodomex',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py2',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-centos7-py2-tcp

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-tcp',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py2',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-centos7-py2-tornado

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-tornado',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py2',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-centos7-py3

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py3',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-centos7-py3-cloud

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ runTestSuite(
88
golden_images_branch: 'master',
99
jenkins_slave_label: 'kitchen-slave',
1010
kitchen_platforms_file: '/var/jenkins/workspace/nox-cloud-platforms.yml',
11-
nox_env_name: 'runtests-zeromq',
11+
nox_env_name: 'runtests-cloud',
1212
nox_passthrough_opts: '',
1313
python_version: 'py3',
14-
run_full: params.runFull,
1514
testrun_timeout: 6,
1615
use_spot_instances: true)
1716

‎.ci/kitchen-centos7-py3-m2crypto

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq-m2crypto',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py3',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-centos7-py3-proxy

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ runTestSuite(
1111
nox_env_name: 'runtests-zeromq',
1212
nox_passthrough_opts: '--proxy',
1313
python_version: 'py3',
14-
run_full: params.runFull,
1514
testrun_timeout: 6,
1615
use_spot_instances: true)
1716

‎.ci/kitchen-centos7-py3-pycryptodomex

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq-pycryptodomex',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py3',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-centos7-py3-tcp

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-tcp',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py3',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-centos8-py3

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py3',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-debian10-py3

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py3',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-debian8-py2

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py2',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-debian9-py2

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py2',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-debian9-py3

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py3',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-fedora30-py2

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py2',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-fedora30-py3

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py3',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

‎.ci/kitchen-fedora31-py3

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py3',
13-
run_full: params.runFull,
1413
testrun_timeout: 6,
1514
use_spot_instances: true)
1615

0 commit comments

Comments
 (0)