diff --git a/.ci/docs b/.ci/docs deleted file mode 100644 index 8d25e63479b..00000000000 --- a/.ci/docs +++ /dev/null @@ -1,6 +0,0 @@ -@Library('salt@master-1.7') _ - -runDocs( - env: env) - -// vim: ft=groovy diff --git a/.ci/kitchen-amazon2-py3 b/.ci/kitchen-amazon2-py3 deleted file mode 100644 index 7b7524cc796..00000000000 --- a/.ci/kitchen-amazon2-py3 +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0878cbac8441fdfdf', - concurrent_builds: 1, - distro_name: 'amazon', - distro_version: '2', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-amazon2-py3-pytest b/.ci/kitchen-amazon2-py3-pytest deleted file mode 100644 index 32e8d653471..00000000000 --- a/.ci/kitchen-amazon2-py3-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0878cbac8441fdfdf', - concurrent_builds: 2, - distro_name: 'amazon', - distro_version: '2', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-archlts-py3 b/.ci/kitchen-archlts-py3 deleted file mode 100644 index 50a84c7e9a1..00000000000 --- a/.ci/kitchen-archlts-py3 +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-074d73d377bbc9002', - concurrent_builds: 1, - distro_name: 'arch', - distro_version: 'lts', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-archlts-py3-pytest b/.ci/kitchen-archlts-py3-pytest deleted file mode 100644 index d6042b4019c..00000000000 --- a/.ci/kitchen-archlts-py3-pytest +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-074d73d377bbc9002', - concurrent_builds: 2, - distro_name: 'arch', - distro_version: 'lts', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3 deleted file mode 100644 index 5f42ead353a..00000000000 --- a/.ci/kitchen-centos7-py3 +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', - concurrent_builds: 1, - distro_name: 'centos', - distro_version: '7', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-centos7-py3-cloud b/.ci/kitchen-centos7-py3-cloud deleted file mode 100644 index 7b0e1ac4822..00000000000 --- a/.ci/kitchen-centos7-py3-cloud +++ /dev/null @@ -1,18 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', - concurrent_builds: 0, - distro_name: 'centos', - distro_version: '7', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - kitchen_platforms_file: '/var/jenkins/workspace/nox-cloud-platforms.yml', - nox_env_name: 'runtests-cloud', - nox_passthrough_opts: '', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-centos7-py3-cloud-pytest b/.ci/kitchen-centos7-py3-cloud-pytest deleted file mode 100644 index 51d95a01fb9..00000000000 --- a/.ci/kitchen-centos7-py3-cloud-pytest +++ /dev/null @@ -1,18 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', - concurrent_builds: 0, // Don't cancel builds still running. Wait until they end. - distro_name: 'centos', - distro_version: '7', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - kitchen_platforms_file: '/var/jenkins/workspace/nox-cloud-platforms.yml', - nox_env_name: 'pytest-cloud', - nox_passthrough_opts: '', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-centos7-py3-m2crypto b/.ci/kitchen-centos7-py3-m2crypto deleted file mode 100644 index 939ab80977d..00000000000 --- a/.ci/kitchen-centos7-py3-m2crypto +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', - concurrent_builds: 1, - distro_name: 'centos', - distro_version: '7', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq-m2crypto', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-centos7-py3-m2crypto-pytest b/.ci/kitchen-centos7-py3-m2crypto-pytest deleted file mode 100644 index 5df9cb4ddc7..00000000000 --- a/.ci/kitchen-centos7-py3-m2crypto-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', - concurrent_builds: 2, - distro_name: 'centos', - distro_version: '7', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq-m2crypto', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-centos7-py3-proxy b/.ci/kitchen-centos7-py3-proxy deleted file mode 100644 index 64df7dca1a3..00000000000 --- a/.ci/kitchen-centos7-py3-proxy +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', - concurrent_builds: 1, - distro_name: 'centos', - distro_version: '7', - env: env, - extra_codecov_flags: ["proxy"], - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--proxy', - python_version: 'py3', - testrun_timeout: 6, - force_run_full: true, - disable_from_filenames: true, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-centos7-py3-pycryptodome b/.ci/kitchen-centos7-py3-pycryptodome deleted file mode 100644 index 1067a177783..00000000000 --- a/.ci/kitchen-centos7-py3-pycryptodome +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', - concurrent_builds: 1, - distro_name: 'centos', - distro_version: '7', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq-pycryptodome', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-centos7-py3-pycryptodome-pytest b/.ci/kitchen-centos7-py3-pycryptodome-pytest deleted file mode 100644 index 791a8c12ce8..00000000000 --- a/.ci/kitchen-centos7-py3-pycryptodome-pytest +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', - concurrent_builds: 2, - distro_name: 'centos', - distro_version: '7', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq-pycryptodome', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-centos7-py3-pytest b/.ci/kitchen-centos7-py3-pytest deleted file mode 100644 index 367f4ff106c..00000000000 --- a/.ci/kitchen-centos7-py3-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', - concurrent_builds: 2, - distro_name: 'centos', - distro_version: '7', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-centos7-py3-tcp b/.ci/kitchen-centos7-py3-tcp deleted file mode 100644 index 28ab390f0c6..00000000000 --- a/.ci/kitchen-centos7-py3-tcp +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', - concurrent_builds: 1, - distro_name: 'centos', - distro_version: '7', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-tcp', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-centos7-py3-tcp-pytest b/.ci/kitchen-centos7-py3-tcp-pytest deleted file mode 100644 index 4dc090a25e8..00000000000 --- a/.ci/kitchen-centos7-py3-tcp-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', - concurrent_builds: 2, - distro_name: 'centos', - distro_version: '7', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-tcp', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-centos8-py3 b/.ci/kitchen-centos8-py3 deleted file mode 100644 index 62f497a05a6..00000000000 --- a/.ci/kitchen-centos8-py3 +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0889b02402d364a73', - concurrent_builds: 1, - distro_name: 'centos', - distro_version: '8', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-centos8-py3-pytest b/.ci/kitchen-centos8-py3-pytest deleted file mode 100644 index a9e0fe75716..00000000000 --- a/.ci/kitchen-centos8-py3-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0889b02402d364a73', - concurrent_builds: 2, - distro_name: 'centos', - distro_version: '8', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-debian10-py3 b/.ci/kitchen-debian10-py3 deleted file mode 100644 index 5eef4bbf144..00000000000 --- a/.ci/kitchen-debian10-py3 +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-08214f129f5580e09', - concurrent_builds: 1, - distro_name: 'debian', - distro_version: '10', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-debian10-py3-pytest b/.ci/kitchen-debian10-py3-pytest deleted file mode 100644 index b4a3d27bb98..00000000000 --- a/.ci/kitchen-debian10-py3-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-08214f129f5580e09', - concurrent_builds: 2, - distro_name: 'debian', - distro_version: '10', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-debian9-py3 b/.ci/kitchen-debian9-py3 deleted file mode 100644 index 0c92314e12d..00000000000 --- a/.ci/kitchen-debian9-py3 +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-03244af0c8908796c', - concurrent_builds: 1, - distro_name: 'debian', - distro_version: '9', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-debian9-py3-pytest b/.ci/kitchen-debian9-py3-pytest deleted file mode 100644 index 2b1a0a8c2da..00000000000 --- a/.ci/kitchen-debian9-py3-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-03244af0c8908796c', - concurrent_builds: 2, - distro_name: 'debian', - distro_version: '9', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-fedora31-py3 b/.ci/kitchen-fedora31-py3 deleted file mode 100644 index 72471592a21..00000000000 --- a/.ci/kitchen-fedora31-py3 +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0a2d674be73e690bc', - concurrent_builds: 1, - distro_name: 'fedora', - distro_version: '31', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-fedora31-py3-pytest b/.ci/kitchen-fedora31-py3-pytest deleted file mode 100644 index 74162b046ac..00000000000 --- a/.ci/kitchen-fedora31-py3-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0a2d674be73e690bc', - concurrent_builds: 2, - distro_name: 'fedora', - distro_version: '31', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-fedora32-py3 b/.ci/kitchen-fedora32-py3 deleted file mode 100644 index 044906bae2a..00000000000 --- a/.ci/kitchen-fedora32-py3 +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-07bb012220c11ce44', - concurrent_builds: 1, - distro_name: 'fedora', - distro_version: '32', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-fedora32-py3-pytest b/.ci/kitchen-fedora32-py3-pytest deleted file mode 100644 index 7d15ae3adb7..00000000000 --- a/.ci/kitchen-fedora32-py3-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-07bb012220c11ce44', - concurrent_builds: 2, - distro_name: 'fedora', - distro_version: '32', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-macosxhighsierra-py3 b/.ci/kitchen-macosxhighsierra-py3 deleted file mode 100644 index db78cb4b38d..00000000000 --- a/.ci/kitchen-macosxhighsierra-py3 +++ /dev/null @@ -1,19 +0,0 @@ -@Library('salt@master-1.7') _ - -// Pre-nox pipeline -runTestSuite( - concurrent_builds: 1, - distro_name: 'macosx', - distro_version: 'highsierra', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave-mac', - kitchen_platforms_file: '/var/jenkins/workspace/pre-golden-nox-platforms.yml', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - run_full: params.runFull, - testrun_timeout: 6, - use_spot_instances: false) - -// vim: ft=groovy diff --git a/.ci/kitchen-macosxhighsierra-py3-pytest b/.ci/kitchen-macosxhighsierra-py3-pytest deleted file mode 100644 index 31e097441c8..00000000000 --- a/.ci/kitchen-macosxhighsierra-py3-pytest +++ /dev/null @@ -1,21 +0,0 @@ -@Library('salt@master-1.7') _ - -// Pre-nox pipeline -runTestSuite( - concurrent_builds: 2, - distro_name: 'macosx', - distro_version: 'highsierra', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave-mac', - kitchen_platforms_file: '/var/jenkins/workspace/pre-golden-nox-platforms.yml', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: false, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-macosxmojave-py3 b/.ci/kitchen-macosxmojave-py3 deleted file mode 100644 index a192949ef5e..00000000000 --- a/.ci/kitchen-macosxmojave-py3 +++ /dev/null @@ -1,19 +0,0 @@ -@Library('salt@master-1.7') _ - -// Pre-nox pipeline -runTestSuite( - concurrent_builds: 1, - distro_name: 'macosx', - distro_version: 'mojave', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave-mac', - kitchen_platforms_file: '/var/jenkins/workspace/pre-golden-nox-platforms.yml', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - run_full: params.runFull, - testrun_timeout: 6, - use_spot_instances: false) - -// vim: ft=groovy diff --git a/.ci/kitchen-macosxmojave-py3-pytest b/.ci/kitchen-macosxmojave-py3-pytest deleted file mode 100644 index 70cb84cad39..00000000000 --- a/.ci/kitchen-macosxmojave-py3-pytest +++ /dev/null @@ -1,21 +0,0 @@ -@Library('salt@master-1.7') _ - -// Pre-nox pipeline -runTestSuite( - concurrent_builds: 2, - distro_name: 'macosx', - distro_version: 'mojave', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave-mac', - kitchen_platforms_file: '/var/jenkins/workspace/pre-golden-nox-platforms.yml', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: false, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-opensuse15-py3 b/.ci/kitchen-opensuse15-py3 deleted file mode 100644 index d2e82730938..00000000000 --- a/.ci/kitchen-opensuse15-py3 +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-03596c046edcc51b0', - concurrent_builds: 1, - distro_name: 'opensuse', - distro_version: '15', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-opensuse15-py3-pytest b/.ci/kitchen-opensuse15-py3-pytest deleted file mode 100644 index cd2979fa684..00000000000 --- a/.ci/kitchen-opensuse15-py3-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-03596c046edcc51b0', - concurrent_builds: 2, - distro_name: 'opensuse', - distro_version: '15', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-ubuntu1604-py3 b/.ci/kitchen-ubuntu1604-py3 deleted file mode 100644 index 3f3b296292e..00000000000 --- a/.ci/kitchen-ubuntu1604-py3 +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', - concurrent_builds: 1, - distro_name: 'ubuntu', - distro_version: '1604', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-ubuntu1604-py3-m2crypto b/.ci/kitchen-ubuntu1604-py3-m2crypto deleted file mode 100644 index 2165608462b..00000000000 --- a/.ci/kitchen-ubuntu1604-py3-m2crypto +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', - concurrent_builds: 1, - distro_name: 'ubuntu', - distro_version: '1604', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq-m2crypto', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-ubuntu1604-py3-m2crypto-pytest b/.ci/kitchen-ubuntu1604-py3-m2crypto-pytest deleted file mode 100644 index 400d28450eb..00000000000 --- a/.ci/kitchen-ubuntu1604-py3-m2crypto-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', - concurrent_builds: 2, - distro_name: 'ubuntu', - distro_version: '1604', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq-m2crypto', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-ubuntu1604-py3-proxy b/.ci/kitchen-ubuntu1604-py3-proxy deleted file mode 100644 index f04ca86c7ee..00000000000 --- a/.ci/kitchen-ubuntu1604-py3-proxy +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', - concurrent_builds: 1, - distro_name: 'ubuntu', - distro_version: '1604', - env: env, - extra_codecov_flags: ["proxy"], - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--proxy', - python_version: 'py3', - testrun_timeout: 6, - force_run_full: true, - disable_from_filenames: true, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-ubuntu1604-py3-pycryptodome b/.ci/kitchen-ubuntu1604-py3-pycryptodome deleted file mode 100644 index f5ae24da4f3..00000000000 --- a/.ci/kitchen-ubuntu1604-py3-pycryptodome +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', - concurrent_builds: 1, - distro_name: 'ubuntu', - distro_version: '1604', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq-pycryptodome', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-ubuntu1604-py3-pycryptodome-pytest b/.ci/kitchen-ubuntu1604-py3-pycryptodome-pytest deleted file mode 100644 index 00c2bee8c8a..00000000000 --- a/.ci/kitchen-ubuntu1604-py3-pycryptodome-pytest +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', - concurrent_builds: 2, - distro_name: 'ubuntu', - distro_version: '1604', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq-pycryptodome', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-ubuntu1604-py3-pytest b/.ci/kitchen-ubuntu1604-py3-pytest deleted file mode 100644 index 11c63eb7724..00000000000 --- a/.ci/kitchen-ubuntu1604-py3-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', - concurrent_builds: 2, - distro_name: 'ubuntu', - distro_version: '1604', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-ubuntu1604-py3-tcp b/.ci/kitchen-ubuntu1604-py3-tcp deleted file mode 100644 index 14e1c4bd519..00000000000 --- a/.ci/kitchen-ubuntu1604-py3-tcp +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', - concurrent_builds: 1, - distro_name: 'ubuntu', - distro_version: '1604', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-tcp', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-ubuntu1604-py3-tcp-pytest b/.ci/kitchen-ubuntu1604-py3-tcp-pytest deleted file mode 100644 index 45f77c2cf45..00000000000 --- a/.ci/kitchen-ubuntu1604-py3-tcp-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', - concurrent_builds: 2, - distro_name: 'ubuntu', - distro_version: '1604', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-tcp', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-ubuntu1804-py3 b/.ci/kitchen-ubuntu1804-py3 deleted file mode 100644 index 120c1afc0c7..00000000000 --- a/.ci/kitchen-ubuntu1804-py3 +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0fb9521f309524452', - concurrent_builds: 1, - distro_name: 'ubuntu', - distro_version: '1804', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-ubuntu1804-py3-pytest b/.ci/kitchen-ubuntu1804-py3-pytest deleted file mode 100644 index f1ce52e8d42..00000000000 --- a/.ci/kitchen-ubuntu1804-py3-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0fb9521f309524452', - concurrent_builds: 2, - distro_name: 'ubuntu', - distro_version: '1804', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-ubuntu2004-py3 b/.ci/kitchen-ubuntu2004-py3 deleted file mode 100644 index 85f6e7dd5f8..00000000000 --- a/.ci/kitchen-ubuntu2004-py3 +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-04e8e52aed128700b', - concurrent_builds: 1, - distro_name: 'ubuntu', - distro_version: '2004', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - testrun_timeout: 6, - use_spot_instances: true) - -// vim: ft=groovy diff --git a/.ci/kitchen-ubuntu2004-py3-pytest b/.ci/kitchen-ubuntu2004-py3-pytest deleted file mode 100644 index 02dd164fe68..00000000000 --- a/.ci/kitchen-ubuntu2004-py3-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-04e8e52aed128700b', - concurrent_builds: 2, - distro_name: 'ubuntu', - distro_version: '2004', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '--ssh-tests', - python_version: 'py3', - //splits: ['unit', 'integration', 'multimaster'], - testrun_timeout: 6, - use_spot_instances: true, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-windows2016-py3 b/.ci/kitchen-windows2016-py3 deleted file mode 100644 index b07841be282..00000000000 --- a/.ci/kitchen-windows2016-py3 +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0efc52f37da135a28', - concurrent_builds: 1, - distro_name: 'windows', - distro_version: '2016', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--unit', - python_version: 'py3', - testrun_timeout: 9, - use_spot_instances: false) - -// vim: ft=groovy diff --git a/.ci/kitchen-windows2016-py3-pytest b/.ci/kitchen-windows2016-py3-pytest deleted file mode 100644 index ba2ef94120f..00000000000 --- a/.ci/kitchen-windows2016-py3-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-0efc52f37da135a28', - concurrent_builds: 2, - distro_name: 'windows', - distro_version: '2016', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '', - python_version: 'py3', - //splits: ['unit', 'integration'], - testrun_timeout: 9, - use_spot_instances: false, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/kitchen-windows2019-py3 b/.ci/kitchen-windows2019-py3 deleted file mode 100644 index 7017e261b85..00000000000 --- a/.ci/kitchen-windows2019-py3 +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-00cf3462a2e4e6810', - concurrent_builds: 1, - distro_name: 'windows', - distro_version: '2019', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq', - nox_passthrough_opts: '--unit', - python_version: 'py3', - testrun_timeout: 10, - use_spot_instances: false) - -// vim: ft=groovy diff --git a/.ci/kitchen-windows2019-py3-pytest b/.ci/kitchen-windows2019-py3-pytest deleted file mode 100644 index 88a1525b801..00000000000 --- a/.ci/kitchen-windows2019-py3-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.7') _ - -runTestSuite( - ami_image_id: 'ami-00cf3462a2e4e6810', - concurrent_builds: 2, - distro_name: 'windows', - distro_version: '2019', - env: env, - golden_images_branch: 'master', - jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'pytest-zeromq', - nox_passthrough_opts: '', - python_version: 'py3', - //splits: ['unit', 'integration'], - testrun_timeout: 10, - use_spot_instances: false, - //fast_slow_staged_testrun: true -) - -// vim: ft=groovy diff --git a/.ci/lint b/.ci/lint deleted file mode 100644 index ceeefc3a760..00000000000 --- a/.ci/lint +++ /dev/null @@ -1,6 +0,0 @@ -@Library('salt@master-1.7') _ - -runLint( - env: env) - -// vim: ft=groovy diff --git a/.ci/pre-commit b/.ci/pre-commit deleted file mode 100644 index fedd031005b..00000000000 --- a/.ci/pre-commit +++ /dev/null @@ -1,15 +0,0 @@ -@Library('salt@master-1.7') _ - -if (env.CHANGE_ID) { - // This is a PR - pre_commit_skips = '' -} else { - // This is a branch build - pre_commit_skips = 'pyupgrade' -} - -runPreCommit( - env: env, - pre_commit_skips: pre_commit_skips) - -// vim: ft=groovy diff --git a/cicd/jenkins/kitchen-amazon2-py3 b/cicd/jenkins/kitchen-amazon2-py3 index 7b7524cc796..184e8505390 100644 --- a/cicd/jenkins/kitchen-amazon2-py3 +++ b/cicd/jenkins/kitchen-amazon2-py3 @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0878cbac8441fdfdf', + ami_image_id: 'ami-05014360ac01845d0', concurrent_builds: 1, distro_name: 'amazon', distro_version: '2', diff --git a/cicd/jenkins/kitchen-amazon2-py3-pytest b/cicd/jenkins/kitchen-amazon2-py3-pytest index 32e8d653471..64ffad04021 100644 --- a/cicd/jenkins/kitchen-amazon2-py3-pytest +++ b/cicd/jenkins/kitchen-amazon2-py3-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0878cbac8441fdfdf', + ami_image_id: 'ami-05014360ac01845d0', concurrent_builds: 2, distro_name: 'amazon', distro_version: '2', diff --git a/cicd/jenkins/kitchen-centos7-py3 b/cicd/jenkins/kitchen-centos7-py3 index 5f42ead353a..b6bfd01c516 100644 --- a/cicd/jenkins/kitchen-centos7-py3 +++ b/cicd/jenkins/kitchen-centos7-py3 @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', + ami_image_id: 'ami-018072d7ecddbe0b7', concurrent_builds: 1, distro_name: 'centos', distro_version: '7', diff --git a/cicd/jenkins/kitchen-centos7-py3-cloud b/cicd/jenkins/kitchen-centos7-py3-cloud index 7b0e1ac4822..566540364e2 100644 --- a/cicd/jenkins/kitchen-centos7-py3-cloud +++ b/cicd/jenkins/kitchen-centos7-py3-cloud @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', + ami_image_id: 'ami-018072d7ecddbe0b7', concurrent_builds: 0, distro_name: 'centos', distro_version: '7', diff --git a/cicd/jenkins/kitchen-centos7-py3-cloud-pytest b/cicd/jenkins/kitchen-centos7-py3-cloud-pytest index 51d95a01fb9..010c741864c 100644 --- a/cicd/jenkins/kitchen-centos7-py3-cloud-pytest +++ b/cicd/jenkins/kitchen-centos7-py3-cloud-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', + ami_image_id: 'ami-018072d7ecddbe0b7', concurrent_builds: 0, // Don't cancel builds still running. Wait until they end. distro_name: 'centos', distro_version: '7', diff --git a/cicd/jenkins/kitchen-centos7-py3-m2crypto b/cicd/jenkins/kitchen-centos7-py3-m2crypto index 939ab80977d..2c67d8b53b9 100644 --- a/cicd/jenkins/kitchen-centos7-py3-m2crypto +++ b/cicd/jenkins/kitchen-centos7-py3-m2crypto @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', + ami_image_id: 'ami-018072d7ecddbe0b7', concurrent_builds: 1, distro_name: 'centos', distro_version: '7', diff --git a/cicd/jenkins/kitchen-centos7-py3-m2crypto-pytest b/cicd/jenkins/kitchen-centos7-py3-m2crypto-pytest index 5df9cb4ddc7..f1f2179dd53 100644 --- a/cicd/jenkins/kitchen-centos7-py3-m2crypto-pytest +++ b/cicd/jenkins/kitchen-centos7-py3-m2crypto-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', + ami_image_id: 'ami-018072d7ecddbe0b7', concurrent_builds: 2, distro_name: 'centos', distro_version: '7', diff --git a/cicd/jenkins/kitchen-centos7-py3-proxy b/cicd/jenkins/kitchen-centos7-py3-proxy index 64df7dca1a3..f81bdea49a3 100644 --- a/cicd/jenkins/kitchen-centos7-py3-proxy +++ b/cicd/jenkins/kitchen-centos7-py3-proxy @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', + ami_image_id: 'ami-018072d7ecddbe0b7', concurrent_builds: 1, distro_name: 'centos', distro_version: '7', diff --git a/cicd/jenkins/kitchen-centos7-py3-pycryptodome b/cicd/jenkins/kitchen-centos7-py3-pycryptodome index 1067a177783..946a376c8a8 100644 --- a/cicd/jenkins/kitchen-centos7-py3-pycryptodome +++ b/cicd/jenkins/kitchen-centos7-py3-pycryptodome @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', + ami_image_id: 'ami-018072d7ecddbe0b7', concurrent_builds: 1, distro_name: 'centos', distro_version: '7', diff --git a/cicd/jenkins/kitchen-centos7-py3-pycryptodome-pytest b/cicd/jenkins/kitchen-centos7-py3-pycryptodome-pytest index 791a8c12ce8..d66bc4a11da 100644 --- a/cicd/jenkins/kitchen-centos7-py3-pycryptodome-pytest +++ b/cicd/jenkins/kitchen-centos7-py3-pycryptodome-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', + ami_image_id: 'ami-018072d7ecddbe0b7', concurrent_builds: 2, distro_name: 'centos', distro_version: '7', diff --git a/cicd/jenkins/kitchen-centos7-py3-pytest b/cicd/jenkins/kitchen-centos7-py3-pytest index 367f4ff106c..db7f245f987 100644 --- a/cicd/jenkins/kitchen-centos7-py3-pytest +++ b/cicd/jenkins/kitchen-centos7-py3-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', + ami_image_id: 'ami-018072d7ecddbe0b7', concurrent_builds: 2, distro_name: 'centos', distro_version: '7', diff --git a/cicd/jenkins/kitchen-centos7-py3-tcp b/cicd/jenkins/kitchen-centos7-py3-tcp index 28ab390f0c6..737100fa10c 100644 --- a/cicd/jenkins/kitchen-centos7-py3-tcp +++ b/cicd/jenkins/kitchen-centos7-py3-tcp @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', + ami_image_id: 'ami-018072d7ecddbe0b7', concurrent_builds: 1, distro_name: 'centos', distro_version: '7', diff --git a/cicd/jenkins/kitchen-centos7-py3-tcp-pytest b/cicd/jenkins/kitchen-centos7-py3-tcp-pytest index 4dc090a25e8..c385b78552b 100644 --- a/cicd/jenkins/kitchen-centos7-py3-tcp-pytest +++ b/cicd/jenkins/kitchen-centos7-py3-tcp-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-046a0996ed20ccd5a', + ami_image_id: 'ami-018072d7ecddbe0b7', concurrent_builds: 2, distro_name: 'centos', distro_version: '7', diff --git a/cicd/jenkins/kitchen-debian10-py3 b/cicd/jenkins/kitchen-debian10-py3 index 5eef4bbf144..aca67a35355 100644 --- a/cicd/jenkins/kitchen-debian10-py3 +++ b/cicd/jenkins/kitchen-debian10-py3 @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-08214f129f5580e09', + ami_image_id: 'ami-0d3dd05e5f7163955', concurrent_builds: 1, distro_name: 'debian', distro_version: '10', diff --git a/cicd/jenkins/kitchen-debian10-py3-pytest b/cicd/jenkins/kitchen-debian10-py3-pytest index b4a3d27bb98..2f41c2f4c7c 100644 --- a/cicd/jenkins/kitchen-debian10-py3-pytest +++ b/cicd/jenkins/kitchen-debian10-py3-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-08214f129f5580e09', + ami_image_id: 'ami-0d3dd05e5f7163955', concurrent_builds: 2, distro_name: 'debian', distro_version: '10', diff --git a/cicd/jenkins/kitchen-debian9-py3 b/cicd/jenkins/kitchen-debian9-py3 index 0c92314e12d..0e02b609b25 100644 --- a/cicd/jenkins/kitchen-debian9-py3 +++ b/cicd/jenkins/kitchen-debian9-py3 @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-03244af0c8908796c', + ami_image_id: 'ami-0b5017d617cf6a296', concurrent_builds: 1, distro_name: 'debian', distro_version: '9', diff --git a/cicd/jenkins/kitchen-debian9-py3-pytest b/cicd/jenkins/kitchen-debian9-py3-pytest index 2b1a0a8c2da..cce44a5bd97 100644 --- a/cicd/jenkins/kitchen-debian9-py3-pytest +++ b/cicd/jenkins/kitchen-debian9-py3-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-03244af0c8908796c', + ami_image_id: 'ami-0b5017d617cf6a296', concurrent_builds: 2, distro_name: 'debian', distro_version: '9', diff --git a/cicd/jenkins/kitchen-fedora32-py3 b/cicd/jenkins/kitchen-fedora32-py3 index 044906bae2a..411c1a417e1 100644 --- a/cicd/jenkins/kitchen-fedora32-py3 +++ b/cicd/jenkins/kitchen-fedora32-py3 @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-07bb012220c11ce44', + ami_image_id: 'ami-0a474f3164afbb53b', concurrent_builds: 1, distro_name: 'fedora', distro_version: '32', diff --git a/cicd/jenkins/kitchen-fedora32-py3-pytest b/cicd/jenkins/kitchen-fedora32-py3-pytest index 7d15ae3adb7..26adf6cee92 100644 --- a/cicd/jenkins/kitchen-fedora32-py3-pytest +++ b/cicd/jenkins/kitchen-fedora32-py3-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-07bb012220c11ce44', + ami_image_id: 'ami-0a474f3164afbb53b', concurrent_builds: 2, distro_name: 'fedora', distro_version: '32', diff --git a/cicd/jenkins/kitchen-freebsd121-py3 b/cicd/jenkins/kitchen-freebsd121-py3 index fe02e4df04e..0039408c640 100644 --- a/cicd/jenkins/kitchen-freebsd121-py3 +++ b/cicd/jenkins/kitchen-freebsd121-py3 @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-097c7303c2c839327', + ami_image_id: 'ami-0df0dc774d411107d', concurrent_builds: 1, distro_name: 'freebsd', distro_version: '121', diff --git a/cicd/jenkins/kitchen-freebsd121-py3-pytest b/cicd/jenkins/kitchen-freebsd121-py3-pytest index 04c905198fd..83561f29dd9 100644 --- a/cicd/jenkins/kitchen-freebsd121-py3-pytest +++ b/cicd/jenkins/kitchen-freebsd121-py3-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-097c7303c2c839327', + ami_image_id: 'ami-0df0dc774d411107d', concurrent_builds: 2, distro_name: 'freebsd', distro_version: '121', diff --git a/cicd/jenkins/kitchen-opensuse15-py3 b/cicd/jenkins/kitchen-opensuse15-py3 index d2e82730938..b2b1fcf8759 100644 --- a/cicd/jenkins/kitchen-opensuse15-py3 +++ b/cicd/jenkins/kitchen-opensuse15-py3 @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-03596c046edcc51b0', + ami_image_id: 'ami-06cc7becf05c5f01f', concurrent_builds: 1, distro_name: 'opensuse', distro_version: '15', diff --git a/cicd/jenkins/kitchen-opensuse15-py3-pytest b/cicd/jenkins/kitchen-opensuse15-py3-pytest index cd2979fa684..7025c3957fc 100644 --- a/cicd/jenkins/kitchen-opensuse15-py3-pytest +++ b/cicd/jenkins/kitchen-opensuse15-py3-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-03596c046edcc51b0', + ami_image_id: 'ami-06cc7becf05c5f01f', concurrent_builds: 2, distro_name: 'opensuse', distro_version: '15', diff --git a/cicd/jenkins/kitchen-ubuntu1604-py3 b/cicd/jenkins/kitchen-ubuntu1604-py3 index 3f3b296292e..89da8394ad6 100644 --- a/cicd/jenkins/kitchen-ubuntu1604-py3 +++ b/cicd/jenkins/kitchen-ubuntu1604-py3 @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', + ami_image_id: 'ami-0271016d2ae2ec10f', concurrent_builds: 1, distro_name: 'ubuntu', distro_version: '1604', diff --git a/cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto b/cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto index 2165608462b..088694e9b03 100644 --- a/cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto +++ b/cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', + ami_image_id: 'ami-0271016d2ae2ec10f', concurrent_builds: 1, distro_name: 'ubuntu', distro_version: '1604', diff --git a/cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto-pytest b/cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto-pytest index 400d28450eb..264964054b0 100644 --- a/cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto-pytest +++ b/cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', + ami_image_id: 'ami-0271016d2ae2ec10f', concurrent_builds: 2, distro_name: 'ubuntu', distro_version: '1604', diff --git a/cicd/jenkins/kitchen-ubuntu1604-py3-proxy b/cicd/jenkins/kitchen-ubuntu1604-py3-proxy index f04ca86c7ee..3529d17d55c 100644 --- a/cicd/jenkins/kitchen-ubuntu1604-py3-proxy +++ b/cicd/jenkins/kitchen-ubuntu1604-py3-proxy @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', + ami_image_id: 'ami-0271016d2ae2ec10f', concurrent_builds: 1, distro_name: 'ubuntu', distro_version: '1604', diff --git a/cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome b/cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome index f5ae24da4f3..4d4520c8c07 100644 --- a/cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome +++ b/cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', + ami_image_id: 'ami-0271016d2ae2ec10f', concurrent_builds: 1, distro_name: 'ubuntu', distro_version: '1604', diff --git a/cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome-pytest b/cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome-pytest index 00c2bee8c8a..9f3fd11da89 100644 --- a/cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome-pytest +++ b/cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', + ami_image_id: 'ami-0271016d2ae2ec10f', concurrent_builds: 2, distro_name: 'ubuntu', distro_version: '1604', diff --git a/cicd/jenkins/kitchen-ubuntu1604-py3-pytest b/cicd/jenkins/kitchen-ubuntu1604-py3-pytest index 11c63eb7724..da6e8d48f63 100644 --- a/cicd/jenkins/kitchen-ubuntu1604-py3-pytest +++ b/cicd/jenkins/kitchen-ubuntu1604-py3-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', + ami_image_id: 'ami-0271016d2ae2ec10f', concurrent_builds: 2, distro_name: 'ubuntu', distro_version: '1604', diff --git a/cicd/jenkins/kitchen-ubuntu1604-py3-tcp b/cicd/jenkins/kitchen-ubuntu1604-py3-tcp index 14e1c4bd519..fd287a20c67 100644 --- a/cicd/jenkins/kitchen-ubuntu1604-py3-tcp +++ b/cicd/jenkins/kitchen-ubuntu1604-py3-tcp @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', + ami_image_id: 'ami-0271016d2ae2ec10f', concurrent_builds: 1, distro_name: 'ubuntu', distro_version: '1604', diff --git a/cicd/jenkins/kitchen-ubuntu1604-py3-tcp-pytest b/cicd/jenkins/kitchen-ubuntu1604-py3-tcp-pytest index 45f77c2cf45..b61be8ff078 100644 --- a/cicd/jenkins/kitchen-ubuntu1604-py3-tcp-pytest +++ b/cicd/jenkins/kitchen-ubuntu1604-py3-tcp-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0aa712706e2a3663b', + ami_image_id: 'ami-0271016d2ae2ec10f', concurrent_builds: 2, distro_name: 'ubuntu', distro_version: '1604', diff --git a/cicd/jenkins/kitchen-ubuntu1804-py3 b/cicd/jenkins/kitchen-ubuntu1804-py3 index 120c1afc0c7..4fd9172292f 100644 --- a/cicd/jenkins/kitchen-ubuntu1804-py3 +++ b/cicd/jenkins/kitchen-ubuntu1804-py3 @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0fb9521f309524452', + ami_image_id: 'ami-04523b8fccbe50f92', concurrent_builds: 1, distro_name: 'ubuntu', distro_version: '1804', diff --git a/cicd/jenkins/kitchen-ubuntu1804-py3-pytest b/cicd/jenkins/kitchen-ubuntu1804-py3-pytest index f1ce52e8d42..b5d3fc9b903 100644 --- a/cicd/jenkins/kitchen-ubuntu1804-py3-pytest +++ b/cicd/jenkins/kitchen-ubuntu1804-py3-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0fb9521f309524452', + ami_image_id: 'ami-04523b8fccbe50f92', concurrent_builds: 2, distro_name: 'ubuntu', distro_version: '1804', diff --git a/cicd/jenkins/kitchen-ubuntu2004-py3 b/cicd/jenkins/kitchen-ubuntu2004-py3 index 85f6e7dd5f8..69218abe7b3 100644 --- a/cicd/jenkins/kitchen-ubuntu2004-py3 +++ b/cicd/jenkins/kitchen-ubuntu2004-py3 @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-04e8e52aed128700b', + ami_image_id: 'ami-0c9da3934b68eb896', concurrent_builds: 1, distro_name: 'ubuntu', distro_version: '2004', diff --git a/cicd/jenkins/kitchen-ubuntu2004-py3-pytest b/cicd/jenkins/kitchen-ubuntu2004-py3-pytest index 02dd164fe68..bba2c5425d2 100644 --- a/cicd/jenkins/kitchen-ubuntu2004-py3-pytest +++ b/cicd/jenkins/kitchen-ubuntu2004-py3-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-04e8e52aed128700b', + ami_image_id: 'ami-0c9da3934b68eb896', concurrent_builds: 2, distro_name: 'ubuntu', distro_version: '2004', diff --git a/cicd/jenkins/kitchen-windows2016-py3 b/cicd/jenkins/kitchen-windows2016-py3 index b07841be282..d2b4562dbec 100644 --- a/cicd/jenkins/kitchen-windows2016-py3 +++ b/cicd/jenkins/kitchen-windows2016-py3 @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0efc52f37da135a28', + ami_image_id: 'ami-0acded867073c36c3', concurrent_builds: 1, distro_name: 'windows', distro_version: '2016', diff --git a/cicd/jenkins/kitchen-windows2016-py3-pytest b/cicd/jenkins/kitchen-windows2016-py3-pytest index ba2ef94120f..20958560ad8 100644 --- a/cicd/jenkins/kitchen-windows2016-py3-pytest +++ b/cicd/jenkins/kitchen-windows2016-py3-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-0efc52f37da135a28', + ami_image_id: 'ami-0acded867073c36c3', concurrent_builds: 2, distro_name: 'windows', distro_version: '2016', diff --git a/cicd/jenkins/kitchen-windows2019-py3 b/cicd/jenkins/kitchen-windows2019-py3 index 7017e261b85..8510c107149 100644 --- a/cicd/jenkins/kitchen-windows2019-py3 +++ b/cicd/jenkins/kitchen-windows2019-py3 @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-00cf3462a2e4e6810', + ami_image_id: 'ami-0d9933d6779f80c0a', concurrent_builds: 1, distro_name: 'windows', distro_version: '2019', diff --git a/cicd/jenkins/kitchen-windows2019-py3-pytest b/cicd/jenkins/kitchen-windows2019-py3-pytest index 88a1525b801..c7ea00447da 100644 --- a/cicd/jenkins/kitchen-windows2019-py3-pytest +++ b/cicd/jenkins/kitchen-windows2019-py3-pytest @@ -1,7 +1,7 @@ @Library('salt@master-1.7') _ runTestSuite( - ami_image_id: 'ami-00cf3462a2e4e6810', + ami_image_id: 'ami-0d9933d6779f80c0a', concurrent_builds: 2, distro_name: 'windows', distro_version: '2019',