saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-15 17:20:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

add distro_arch

Browse source
This commit is contained in:
Bryce Larson 2021-03-22 22:15:19 +00:00 • committed by Gareth J. Greenaway
parent 6c59577df8
commit 1a9b7be0e2
28 changed files with 46 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/59913.removed Normal file
View file

@ -0,0 +1 @@
Removed support for Ubuntu 16.04

20
cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto-pytest
View file

@ -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

17
cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome-pytest
View file

@ -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

20
cicd/jenkins/kitchen-ubuntu1604-py3-pytest
View file

@ -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

20
cicd/jenkins/kitchen-ubuntu1604-py3-tcp-pytest
View file

@ -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

3
cicd/jenkins/kitchen-amazon2-py3-pytest → cicd/jenkins/pr-amazon-2-x86_64-py3-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-archlts-py3-pytest → cicd/jenkins/pr-arch-lts-x86_64-py3-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-centos7-py3-cloud-pytest → cicd/jenkins/pr-centos-7-x86_64-py3-cloud-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-centos7-py3-m2crypto-pytest → cicd/jenkins/pr-centos-7-x86_64-py3-m2crypto-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-centos7-py3-pycryptodome-pytest → cicd/jenkins/pr-centos-7-x86_64-py3-pycryptodome-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-centos7-py3-pytest → cicd/jenkins/pr-centos-7-x86_64-py3-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-centos7-py3-tcp-pytest → cicd/jenkins/pr-centos-7-x86_64-py3-tcp-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-centos8-py3-pytest → cicd/jenkins/pr-centos-8-x86_64-py3-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-debian10-py3-pytest → cicd/jenkins/pr-debian-10-amd64-py3-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-debian9-py3-pytest → cicd/jenkins/pr-debian-9-amd64-py3-pytest
View file

@ -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',

2
cicd/jenkins/docs → cicd/jenkins/pr-docs
View file

@ -1,4 +1,4 @@
@Library('salt@master-1.9') _
@Library('salt@master-1.10') _
runDocs(
env: env)

3
cicd/jenkins/kitchen-fedora32-py3-pytest → cicd/jenkins/pr-fedora-32-x86_64-py3-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-fedora33-py3-pytest → cicd/jenkins/pr-fedora-33-x86_64-py3-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-freebsd122-py3-pytest → cicd/jenkins/pr-freebsd-122-amd64-py3-pytest
View file

@ -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',

2
cicd/jenkins/lint → cicd/jenkins/pr-lint
View file

@ -1,4 +1,4 @@
@Library('salt@master-1.9') _
@Library('salt@master-1.10') _
runLint(
env: env)

5
cicd/jenkins/kitchen-macosxcatalina-py3-pytest → cicd/jenkins/pr-macosx-catalina-x86_64-py3-pytest
View file

@ -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',

5
cicd/jenkins/kitchen-macosxmojave-py3-pytest → cicd/jenkins/pr-macosx-mojave-x86_64-py3-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-opensuse15-py3-pytest → cicd/jenkins/pr-opensuse-15-x86_64-py3-pytest
View file

@ -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',

2
cicd/jenkins/pre-commit → cicd/jenkins/pr-pre-commit
View file

@ -1,4 +1,4 @@
@Library('salt@master-1.9') _
@Library('salt@master-1.10') _
if (env.CHANGE_ID) {
// This is a PR

3
cicd/jenkins/kitchen-ubuntu1804-py3-pytest → cicd/jenkins/pr-ubuntu-1804-amd64-py3-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-ubuntu2004-py3-pytest → cicd/jenkins/pr-ubuntu-2004-amd64-py3-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-windows2016-py3-pytest → cicd/jenkins/pr-windows-2016-x64-py3-pytest
View file

@ -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',

3
cicd/jenkins/kitchen-windows2019-py3-pytest → cicd/jenkins/pr-windows-2019-x64-py3-pytest
View file

@ -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',