From 1a9b7be0e2f300d87924731dc5816fd1000cd22b Mon Sep 17 00:00:00 2001 From: Bryce Larson Date: Mon, 22 Mar 2021 22:15:19 +0000 Subject: [PATCH] add distro_arch --- changelog/59913.removed | 1 + .../kitchen-ubuntu1604-py3-m2crypto-pytest | 20 ------------------- ...kitchen-ubuntu1604-py3-pycryptodome-pytest | 17 ---------------- cicd/jenkins/kitchen-ubuntu1604-py3-pytest | 20 ------------------- .../jenkins/kitchen-ubuntu1604-py3-tcp-pytest | 20 ------------------- ...3-pytest => pr-amazon-2-x86_64-py3-pytest} | 3 ++- ...3-pytest => pr-arch-lts-x86_64-py3-pytest} | 3 ++- ...st => pr-centos-7-x86_64-py3-cloud-pytest} | 3 ++- ...=> pr-centos-7-x86_64-py3-m2crypto-pytest} | 3 ++- ...r-centos-7-x86_64-py3-pycryptodome-pytest} | 3 ++- ...3-pytest => pr-centos-7-x86_64-py3-pytest} | 3 ++- ...test => pr-centos-7-x86_64-py3-tcp-pytest} | 3 ++- ...3-pytest => pr-centos-8-x86_64-py3-pytest} | 3 ++- ...3-pytest => pr-debian-10-amd64-py3-pytest} | 3 ++- ...y3-pytest => pr-debian-9-amd64-py3-pytest} | 3 ++- cicd/jenkins/{docs => pr-docs} | 2 +- ...-pytest => pr-fedora-32-x86_64-py3-pytest} | 3 ++- ...-pytest => pr-fedora-33-x86_64-py3-pytest} | 3 ++- ...pytest => pr-freebsd-122-amd64-py3-pytest} | 3 ++- cicd/jenkins/{lint => pr-lint} | 2 +- ...t => pr-macosx-catalina-x86_64-py3-pytest} | 5 +++-- ...est => pr-macosx-mojave-x86_64-py3-pytest} | 5 +++-- ...ytest => pr-opensuse-15-x86_64-py3-pytest} | 3 ++- cicd/jenkins/{pre-commit => pr-pre-commit} | 2 +- ...pytest => pr-ubuntu-1804-amd64-py3-pytest} | 3 ++- ...pytest => pr-ubuntu-2004-amd64-py3-pytest} | 3 ++- ...-pytest => pr-windows-2016-x64-py3-pytest} | 3 ++- ...-pytest => pr-windows-2019-x64-py3-pytest} | 3 ++- 28 files changed, 46 insertions(+), 102 deletions(-) create mode 100644 changelog/59913.removed delete mode 100644 cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto-pytest delete mode 100644 cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome-pytest delete mode 100644 cicd/jenkins/kitchen-ubuntu1604-py3-pytest delete mode 100644 cicd/jenkins/kitchen-ubuntu1604-py3-tcp-pytest rename cicd/jenkins/{kitchen-amazon2-py3-pytest => pr-amazon-2-x86_64-py3-pytest} (89%) rename cicd/jenkins/{kitchen-archlts-py3-pytest => pr-arch-lts-x86_64-py3-pytest} (87%) rename cicd/jenkins/{kitchen-centos7-py3-cloud-pytest => pr-centos-7-x86_64-py3-cloud-pytest} (90%) rename cicd/jenkins/{kitchen-centos7-py3-m2crypto-pytest => pr-centos-7-x86_64-py3-m2crypto-pytest} (89%) rename cicd/jenkins/{kitchen-centos7-py3-pycryptodome-pytest => pr-centos-7-x86_64-py3-pycryptodome-pytest} (87%) rename cicd/jenkins/{kitchen-centos7-py3-pytest => pr-centos-7-x86_64-py3-pytest} (89%) rename cicd/jenkins/{kitchen-centos7-py3-tcp-pytest => pr-centos-7-x86_64-py3-tcp-pytest} (89%) rename cicd/jenkins/{kitchen-centos8-py3-pytest => pr-centos-8-x86_64-py3-pytest} (89%) rename cicd/jenkins/{kitchen-debian10-py3-pytest => pr-debian-10-amd64-py3-pytest} (89%) rename cicd/jenkins/{kitchen-debian9-py3-pytest => pr-debian-9-amd64-py3-pytest} (89%) rename cicd/jenkins/{docs => pr-docs} (58%) rename cicd/jenkins/{kitchen-fedora32-py3-pytest => pr-fedora-32-x86_64-py3-pytest} (89%) rename cicd/jenkins/{kitchen-fedora33-py3-pytest => pr-fedora-33-x86_64-py3-pytest} (89%) rename cicd/jenkins/{kitchen-freebsd122-py3-pytest => pr-freebsd-122-amd64-py3-pytest} (89%) rename cicd/jenkins/{lint => pr-lint} (58%) rename cicd/jenkins/{kitchen-macosxcatalina-py3-pytest => pr-macosx-catalina-x86_64-py3-pytest} (78%) rename cicd/jenkins/{kitchen-macosxmojave-py3-pytest => pr-macosx-mojave-x86_64-py3-pytest} (77%) rename cicd/jenkins/{kitchen-opensuse15-py3-pytest => pr-opensuse-15-x86_64-py3-pytest} (89%) rename cicd/jenkins/{pre-commit => pr-pre-commit} (89%) rename cicd/jenkins/{kitchen-ubuntu1804-py3-pytest => pr-ubuntu-1804-amd64-py3-pytest} (89%) rename cicd/jenkins/{kitchen-ubuntu2004-py3-pytest => pr-ubuntu-2004-amd64-py3-pytest} (89%) rename cicd/jenkins/{kitchen-windows2016-py3-pytest => pr-windows-2016-x64-py3-pytest} (89%) rename cicd/jenkins/{kitchen-windows2019-py3-pytest => pr-windows-2019-x64-py3-pytest} (89%) diff --git a/changelog/59913.removed b/changelog/59913.removed new file mode 100644 index 00000000000..eda232e4fc9 --- /dev/null +++ b/changelog/59913.removed @@ -0,0 +1 @@ +Removed support for Ubuntu 16.04 diff --git a/cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto-pytest b/cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto-pytest deleted file mode 100644 index ced9388049b..00000000000 --- a/cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.9') _ - -runTestSuite( - ami_image_id: 'ami-095abce041f0323d2', - concurrent_builds: 1, - 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/cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome-pytest b/cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome-pytest deleted file mode 100644 index a1288d01ef8..00000000000 --- a/cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome-pytest +++ /dev/null @@ -1,17 +0,0 @@ -@Library('salt@master-1.9') _ - -runTestSuite( - ami_image_id: 'ami-095abce041f0323d2', - concurrent_builds: 1, - 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/cicd/jenkins/kitchen-ubuntu1604-py3-pytest b/cicd/jenkins/kitchen-ubuntu1604-py3-pytest deleted file mode 100644 index 75eacf588f3..00000000000 --- a/cicd/jenkins/kitchen-ubuntu1604-py3-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.9') _ - -runTestSuite( - ami_image_id: 'ami-095abce041f0323d2', - concurrent_builds: 1, - 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/cicd/jenkins/kitchen-ubuntu1604-py3-tcp-pytest b/cicd/jenkins/kitchen-ubuntu1604-py3-tcp-pytest deleted file mode 100644 index 9c7ccee1a8c..00000000000 --- a/cicd/jenkins/kitchen-ubuntu1604-py3-tcp-pytest +++ /dev/null @@ -1,20 +0,0 @@ -@Library('salt@master-1.9') _ - -runTestSuite( - ami_image_id: 'ami-095abce041f0323d2', - concurrent_builds: 1, - 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/cicd/jenkins/kitchen-amazon2-py3-pytest b/cicd/jenkins/pr-amazon-2-x86_64-py3-pytest similarity index 89% rename from cicd/jenkins/kitchen-amazon2-py3-pytest rename to cicd/jenkins/pr-amazon-2-x86_64-py3-pytest index 2f174efb3d9..f836b95fd47 100644 --- a/cicd/jenkins/kitchen-amazon2-py3-pytest +++ b/cicd/jenkins/pr-amazon-2-x86_64-py3-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-099d7623ded3199ea', concurrent_builds: 1, distro_name: 'amazon', distro_version: '2', + distro_arch: 'x86-64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/kitchen-archlts-py3-pytest b/cicd/jenkins/pr-arch-lts-x86_64-py3-pytest similarity index 87% rename from cicd/jenkins/kitchen-archlts-py3-pytest rename to cicd/jenkins/pr-arch-lts-x86_64-py3-pytest index 3291125a373..a9419bdbfc1 100644 --- a/cicd/jenkins/kitchen-archlts-py3-pytest +++ b/cicd/jenkins/pr-arch-lts-x86_64-py3-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-09a38a1d2d9fa3201', concurrent_builds: 1, distro_name: 'arch', distro_version: 'lts', + distro_arch: 'x86-64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/kitchen-centos7-py3-cloud-pytest b/cicd/jenkins/pr-centos-7-x86_64-py3-cloud-pytest similarity index 90% rename from cicd/jenkins/kitchen-centos7-py3-cloud-pytest rename to cicd/jenkins/pr-centos-7-x86_64-py3-cloud-pytest index 073169e83e0..0a762018367 100644 --- a/cicd/jenkins/kitchen-centos7-py3-cloud-pytest +++ b/cicd/jenkins/pr-centos-7-x86_64-py3-cloud-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-05764f27cdf8f99e0', concurrent_builds: 0, // Don't cancel builds still running. Wait until they end. distro_name: 'centos', distro_version: '7', + distro_arch: 'x86-64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/kitchen-centos7-py3-m2crypto-pytest b/cicd/jenkins/pr-centos-7-x86_64-py3-m2crypto-pytest similarity index 89% rename from cicd/jenkins/kitchen-centos7-py3-m2crypto-pytest rename to cicd/jenkins/pr-centos-7-x86_64-py3-m2crypto-pytest index e6da02d6a47..58bd75cbbc1 100644 --- a/cicd/jenkins/kitchen-centos7-py3-m2crypto-pytest +++ b/cicd/jenkins/pr-centos-7-x86_64-py3-m2crypto-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-05764f27cdf8f99e0', concurrent_builds: 1, distro_name: 'centos', distro_version: '7', + distro_arch: 'x86-64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/kitchen-centos7-py3-pycryptodome-pytest b/cicd/jenkins/pr-centos-7-x86_64-py3-pycryptodome-pytest similarity index 87% rename from cicd/jenkins/kitchen-centos7-py3-pycryptodome-pytest rename to cicd/jenkins/pr-centos-7-x86_64-py3-pycryptodome-pytest index c776b68274e..804cf24de1f 100644 --- a/cicd/jenkins/kitchen-centos7-py3-pycryptodome-pytest +++ b/cicd/jenkins/pr-centos-7-x86_64-py3-pycryptodome-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-05764f27cdf8f99e0', concurrent_builds: 1, distro_name: 'centos', distro_version: '7', + distro_arch: 'x86-64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/kitchen-centos7-py3-pytest b/cicd/jenkins/pr-centos-7-x86_64-py3-pytest similarity index 89% rename from cicd/jenkins/kitchen-centos7-py3-pytest rename to cicd/jenkins/pr-centos-7-x86_64-py3-pytest index 375f9c824ae..f1cf78ccee6 100644 --- a/cicd/jenkins/kitchen-centos7-py3-pytest +++ b/cicd/jenkins/pr-centos-7-x86_64-py3-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-05764f27cdf8f99e0', concurrent_builds: 1, distro_name: 'centos', distro_version: '7', + distro_arch: 'x86-64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/kitchen-centos7-py3-tcp-pytest b/cicd/jenkins/pr-centos-7-x86_64-py3-tcp-pytest similarity index 89% rename from cicd/jenkins/kitchen-centos7-py3-tcp-pytest rename to cicd/jenkins/pr-centos-7-x86_64-py3-tcp-pytest index 2ff32f95598..6ad4e58d676 100644 --- a/cicd/jenkins/kitchen-centos7-py3-tcp-pytest +++ b/cicd/jenkins/pr-centos-7-x86_64-py3-tcp-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-05764f27cdf8f99e0', concurrent_builds: 1, distro_name: 'centos', distro_version: '7', + distro_arch: 'x86-64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/kitchen-centos8-py3-pytest b/cicd/jenkins/pr-centos-8-x86_64-py3-pytest similarity index 89% rename from cicd/jenkins/kitchen-centos8-py3-pytest rename to cicd/jenkins/pr-centos-8-x86_64-py3-pytest index 6e1d428a7c2..6d01362ba96 100644 --- a/cicd/jenkins/kitchen-centos8-py3-pytest +++ b/cicd/jenkins/pr-centos-8-x86_64-py3-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-0d482e88fbf35072c', concurrent_builds: 1, distro_name: 'centos', distro_version: '8', + distro_arch: 'x86-64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/kitchen-debian10-py3-pytest b/cicd/jenkins/pr-debian-10-amd64-py3-pytest similarity index 89% rename from cicd/jenkins/kitchen-debian10-py3-pytest rename to cicd/jenkins/pr-debian-10-amd64-py3-pytest index e81af4dbbc6..98d7ae8f666 100644 --- a/cicd/jenkins/kitchen-debian10-py3-pytest +++ b/cicd/jenkins/pr-debian-10-amd64-py3-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-0eb32b3297dc438d0', concurrent_builds: 1, distro_name: 'debian', distro_version: '10', + distro_arch: 'amd64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/kitchen-debian9-py3-pytest b/cicd/jenkins/pr-debian-9-amd64-py3-pytest similarity index 89% rename from cicd/jenkins/kitchen-debian9-py3-pytest rename to cicd/jenkins/pr-debian-9-amd64-py3-pytest index 35c37fde44f..6c0fb42d741 100644 --- a/cicd/jenkins/kitchen-debian9-py3-pytest +++ b/cicd/jenkins/pr-debian-9-amd64-py3-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-033ed8f0f55cad1e0', concurrent_builds: 1, distro_name: 'debian', distro_version: '9', + distro_arch: 'amd64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/docs b/cicd/jenkins/pr-docs similarity index 58% rename from cicd/jenkins/docs rename to cicd/jenkins/pr-docs index e3d94e8cdb7..65649a3e8f3 100644 --- a/cicd/jenkins/docs +++ b/cicd/jenkins/pr-docs @@ -1,4 +1,4 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runDocs( env: env) diff --git a/cicd/jenkins/kitchen-fedora32-py3-pytest b/cicd/jenkins/pr-fedora-32-x86_64-py3-pytest similarity index 89% rename from cicd/jenkins/kitchen-fedora32-py3-pytest rename to cicd/jenkins/pr-fedora-32-x86_64-py3-pytest index a41f064359e..2e99714466b 100644 --- a/cicd/jenkins/kitchen-fedora32-py3-pytest +++ b/cicd/jenkins/pr-fedora-32-x86_64-py3-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-092f9c304a1403a02', concurrent_builds: 1, distro_name: 'fedora', distro_version: '32', + distro_arch: 'x86-64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/kitchen-fedora33-py3-pytest b/cicd/jenkins/pr-fedora-33-x86_64-py3-pytest similarity index 89% rename from cicd/jenkins/kitchen-fedora33-py3-pytest rename to cicd/jenkins/pr-fedora-33-x86_64-py3-pytest index 7ab64170215..1cb2fde9dc2 100644 --- a/cicd/jenkins/kitchen-fedora33-py3-pytest +++ b/cicd/jenkins/pr-fedora-33-x86_64-py3-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-0f325553c2ef49ecf', concurrent_builds: 1, distro_name: 'fedora', distro_version: '33', + distro_arch: 'x86-64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/kitchen-freebsd122-py3-pytest b/cicd/jenkins/pr-freebsd-122-amd64-py3-pytest similarity index 89% rename from cicd/jenkins/kitchen-freebsd122-py3-pytest rename to cicd/jenkins/pr-freebsd-122-amd64-py3-pytest index 4e5ca3648d0..8f8c5fd3235 100644 --- a/cicd/jenkins/kitchen-freebsd122-py3-pytest +++ b/cicd/jenkins/pr-freebsd-122-amd64-py3-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-0f8692a4a769c17e4', concurrent_builds: 1, distro_name: 'freebsd', distro_version: '122', + distro_arch: 'amd64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/lint b/cicd/jenkins/pr-lint similarity index 58% rename from cicd/jenkins/lint rename to cicd/jenkins/pr-lint index c22b0c69503..6d68bda835a 100644 --- a/cicd/jenkins/lint +++ b/cicd/jenkins/pr-lint @@ -1,4 +1,4 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runLint( env: env) diff --git a/cicd/jenkins/kitchen-macosxcatalina-py3-pytest b/cicd/jenkins/pr-macosx-catalina-x86_64-py3-pytest similarity index 78% rename from cicd/jenkins/kitchen-macosxcatalina-py3-pytest rename to cicd/jenkins/pr-macosx-catalina-x86_64-py3-pytest index 6e6d96ace06..e81e9e1558a 100644 --- a/cicd/jenkins/kitchen-macosxcatalina-py3-pytest +++ b/cicd/jenkins/pr-macosx-catalina-x86_64-py3-pytest @@ -1,14 +1,15 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ // Pre-nox pipeline runTestSuite( concurrent_builds: 1, distro_name: 'macosx', distro_version: 'catalina', + distro_arch: 'x86-64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave-mac', - kitchen_platforms_file: '/var/jenkins/workspace/pre-golden-nox-platforms.yml', + kitchen_platforms_file: '/var/jenkins/workspace/pre-golden-platforms.yml', nox_env_name: 'pytest-zeromq', nox_passthrough_opts: '--ssh-tests', python_version: 'py3', diff --git a/cicd/jenkins/kitchen-macosxmojave-py3-pytest b/cicd/jenkins/pr-macosx-mojave-x86_64-py3-pytest similarity index 77% rename from cicd/jenkins/kitchen-macosxmojave-py3-pytest rename to cicd/jenkins/pr-macosx-mojave-x86_64-py3-pytest index 6b215ba7534..46057bd2922 100644 --- a/cicd/jenkins/kitchen-macosxmojave-py3-pytest +++ b/cicd/jenkins/pr-macosx-mojave-x86_64-py3-pytest @@ -1,14 +1,15 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ // Pre-nox pipeline runTestSuite( concurrent_builds: 1, distro_name: 'macosx', distro_version: 'mojave', + distro_arch: 'x86-64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave-mac', - kitchen_platforms_file: '/var/jenkins/workspace/pre-golden-nox-platforms.yml', + kitchen_platforms_file: '/var/jenkins/workspace/pre-golden-platforms.yml', nox_env_name: 'pytest-zeromq', nox_passthrough_opts: '--ssh-tests', python_version: 'py3', diff --git a/cicd/jenkins/kitchen-opensuse15-py3-pytest b/cicd/jenkins/pr-opensuse-15-x86_64-py3-pytest similarity index 89% rename from cicd/jenkins/kitchen-opensuse15-py3-pytest rename to cicd/jenkins/pr-opensuse-15-x86_64-py3-pytest index 7fb389d25ef..620616be2ac 100644 --- a/cicd/jenkins/kitchen-opensuse15-py3-pytest +++ b/cicd/jenkins/pr-opensuse-15-x86_64-py3-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-01f083bce987e56ce', concurrent_builds: 1, distro_name: 'opensuse', distro_version: '15', + distro_arch: 'x86-64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/pre-commit b/cicd/jenkins/pr-pre-commit similarity index 89% rename from cicd/jenkins/pre-commit rename to cicd/jenkins/pr-pre-commit index c656c0190b2..8667ca0539c 100644 --- a/cicd/jenkins/pre-commit +++ b/cicd/jenkins/pr-pre-commit @@ -1,4 +1,4 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ if (env.CHANGE_ID) { // This is a PR diff --git a/cicd/jenkins/kitchen-ubuntu1804-py3-pytest b/cicd/jenkins/pr-ubuntu-1804-amd64-py3-pytest similarity index 89% rename from cicd/jenkins/kitchen-ubuntu1804-py3-pytest rename to cicd/jenkins/pr-ubuntu-1804-amd64-py3-pytest index 71030482a88..c66b435d232 100644 --- a/cicd/jenkins/kitchen-ubuntu1804-py3-pytest +++ b/cicd/jenkins/pr-ubuntu-1804-amd64-py3-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-0decb138fa5e24979', concurrent_builds: 1, distro_name: 'ubuntu', distro_version: '1804', + distro_arch: 'amd64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/kitchen-ubuntu2004-py3-pytest b/cicd/jenkins/pr-ubuntu-2004-amd64-py3-pytest similarity index 89% rename from cicd/jenkins/kitchen-ubuntu2004-py3-pytest rename to cicd/jenkins/pr-ubuntu-2004-amd64-py3-pytest index 93b5a3ebbb0..6b10028c2c0 100644 --- a/cicd/jenkins/kitchen-ubuntu2004-py3-pytest +++ b/cicd/jenkins/pr-ubuntu-2004-amd64-py3-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-0468248e8ecfacd5c', concurrent_builds: 1, distro_name: 'ubuntu', distro_version: '2004', + distro_arch: 'amd64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/kitchen-windows2016-py3-pytest b/cicd/jenkins/pr-windows-2016-x64-py3-pytest similarity index 89% rename from cicd/jenkins/kitchen-windows2016-py3-pytest rename to cicd/jenkins/pr-windows-2016-x64-py3-pytest index 0311477642d..9ea612c3646 100644 --- a/cicd/jenkins/kitchen-windows2016-py3-pytest +++ b/cicd/jenkins/pr-windows-2016-x64-py3-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-091ceee536c181547', concurrent_builds: 1, distro_name: 'windows', distro_version: '2016', + distro_arch: 'x64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', diff --git a/cicd/jenkins/kitchen-windows2019-py3-pytest b/cicd/jenkins/pr-windows-2019-x64-py3-pytest similarity index 89% rename from cicd/jenkins/kitchen-windows2019-py3-pytest rename to cicd/jenkins/pr-windows-2019-x64-py3-pytest index 506e2b569ba..cc4ab689882 100644 --- a/cicd/jenkins/kitchen-windows2019-py3-pytest +++ b/cicd/jenkins/pr-windows-2019-x64-py3-pytest @@ -1,10 +1,11 @@ -@Library('salt@master-1.9') _ +@Library('salt@master-1.10') _ runTestSuite( ami_image_id: 'ami-089971e887302c15e', concurrent_builds: 1, distro_name: 'windows', distro_version: '2019', + distro_arch: 'x64', env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave',