-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into master-bp-53343
- Loading branch information
Showing
228 changed files
with
3,874 additions
and
6,312 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,6 @@ | ||
| @Library('salt@1.1') _ | ||
| @Library('salt@master-1.5') _ | ||
|
|
||
| // Define the maximum time, in hours, that a test run should run for | ||
| def global_timeout = 2 | ||
|
|
||
| properties([ | ||
| buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')), | ||
| ]) | ||
|
|
||
| // Only set milestones on PR builds | ||
| if (env.CHANGE_ID) { | ||
| // Be sure to cancel any previously running builds | ||
| def buildNumber = env.BUILD_NUMBER as int | ||
| if (buildNumber > 1) { | ||
| // This will cancel the previous build which also defined a matching milestone | ||
| milestone(buildNumber - 1) | ||
| } | ||
| // Define a milestone for this build so that, if another build starts, this one will be aborted | ||
| milestone(buildNumber) | ||
| } | ||
|
|
||
| def shell_header | ||
|
|
||
| wrappedNode('docs', global_timeout, '#jenkins-prod-pr') { | ||
|
|
||
| shell_header = '' | ||
| // Checkout the repo | ||
| stage('checkout-scm') { | ||
| cleanWs notFailBuild: true | ||
| checkout scm | ||
| } | ||
|
|
||
| // Setup the kitchen required bundle | ||
| stage('Setup') { | ||
| sh shell_header + ''' | ||
| eval "$(pyenv init -)" | ||
| pyenv --version | ||
| pyenv install --skip-existing 3.6.8 | ||
| pyenv shell 3.6.8 | ||
| python --version | ||
| pip install -U nox-py2 | ||
| nox --version | ||
| ''' | ||
| } | ||
|
|
||
| stage('Build HTML Docs') { | ||
| sh shell_header + ''' | ||
| eval "$(pyenv init -)" | ||
| pyenv shell 3.6.8 | ||
| nox -e 'docs-html(compress=True)' | ||
| ''' | ||
| archiveArtifacts artifacts: 'doc/html-archive.tar.gz' | ||
| } | ||
|
|
||
| stage('Build Man Pages') { | ||
| sh shell_header + ''' | ||
| eval "$(pyenv init -)" | ||
| pyenv shell 3.6.8 | ||
| nox -e 'docs-man(compress=True, update=False)' | ||
| ''' | ||
| archiveArtifacts artifacts: 'doc/man-archive.tar.gz' | ||
| } | ||
| } | ||
| runDocs( | ||
| env: env) | ||
|
|
||
| // vim: ft=groovy |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,16 @@ | ||
| @Library('salt@master-1.3') _ | ||
| @Library('salt@master-1.5') _ | ||
|
|
||
| // Define the maximum time, in hours, that a test run should run for | ||
| def testrun_timeout = 6 | ||
|
|
||
| def distro_name = 'amazon' | ||
| def distro_version = '1' | ||
| def python_version = 'py2' | ||
| def nox_env_name = 'runtests-zeromq' | ||
| def golden_images_branch = 'master' | ||
| def nox_passthrough_opts = '--ssh-tests' | ||
| def concurrent_builds = 1 | ||
| def use_spot_instances = true | ||
| def jenkins_slave_label = 'kitchen-slave' | ||
|
|
||
| properties([ | ||
| buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30')), | ||
| parameters([ | ||
| booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull') | ||
| ]) | ||
| ]) | ||
|
|
||
| // Only set milestones on PR builds | ||
| if (env.CHANGE_ID) { | ||
| // Be sure to cancel any previously running builds | ||
| def buildNumber = env.BUILD_NUMBER as int | ||
| if (buildNumber > concurrent_builds) { | ||
| // This will cancel the previous build which also defined a matching milestone | ||
| milestone(buildNumber - concurrent_builds) | ||
| } | ||
| // Define a milestone for this build so that, if another build starts, this one will be aborted | ||
| milestone(buildNumber) | ||
| } | ||
|
|
||
| runTests( | ||
| runTestSuite( | ||
| concurrent_builds: 1, | ||
| distro_name: 'amazon', | ||
| distro_version: '1', | ||
| env: env, | ||
| distro_name: distro_name, | ||
| distro_version: distro_version, | ||
| python_version: python_version, | ||
| golden_images_branch: golden_images_branch, | ||
| nox_env_name: nox_env_name, | ||
| nox_passthrough_opts: nox_passthrough_opts, | ||
| testrun_timeout: testrun_timeout, | ||
| run_full: params.runFull, | ||
| use_spot_instances: use_spot_instances, | ||
| jenkins_slave_label: jenkins_slave_label) | ||
| golden_images_branch: 'master', | ||
| jenkins_slave_label: 'kitchen-slave', | ||
| nox_env_name: 'runtests-zeromq', | ||
| nox_passthrough_opts: '--ssh-tests', | ||
| python_version: 'py2', | ||
| testrun_timeout: 6, | ||
| use_spot_instances: true) | ||
|
|
||
| // vim: ft=groovy |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,16 @@ | ||
| @Library('salt@master-1.3') _ | ||
| @Library('salt@master-1.5') _ | ||
|
|
||
| // Define the maximum time, in hours, that a test run should run for | ||
| def testrun_timeout = 6 | ||
|
|
||
| def distro_name = 'amazon' | ||
| def distro_version = '2' | ||
| def python_version = 'py2' | ||
| def nox_env_name = 'runtests-zeromq' | ||
| def golden_images_branch = 'master' | ||
| def nox_passthrough_opts = '--ssh-tests' | ||
| def concurrent_builds = 1 | ||
| def use_spot_instances = true | ||
| def jenkins_slave_label = 'kitchen-slave' | ||
|
|
||
| properties([ | ||
| buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30')), | ||
| parameters([ | ||
| booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull') | ||
| ]) | ||
| ]) | ||
|
|
||
| // Only set milestones on PR builds | ||
| if (env.CHANGE_ID) { | ||
| // Be sure to cancel any previously running builds | ||
| def buildNumber = env.BUILD_NUMBER as int | ||
| if (buildNumber > concurrent_builds) { | ||
| // This will cancel the previous build which also defined a matching milestone | ||
| milestone(buildNumber - concurrent_builds) | ||
| } | ||
| // Define a milestone for this build so that, if another build starts, this one will be aborted | ||
| milestone(buildNumber) | ||
| } | ||
|
|
||
| runTests( | ||
| runTestSuite( | ||
| concurrent_builds: 1, | ||
| distro_name: 'amazon', | ||
| distro_version: '2', | ||
| env: env, | ||
| distro_name: distro_name, | ||
| distro_version: distro_version, | ||
| python_version: python_version, | ||
| golden_images_branch: golden_images_branch, | ||
| nox_env_name: nox_env_name, | ||
| nox_passthrough_opts: nox_passthrough_opts, | ||
| testrun_timeout: testrun_timeout, | ||
| run_full: params.runFull, | ||
| use_spot_instances: use_spot_instances, | ||
| jenkins_slave_label: jenkins_slave_label) | ||
| golden_images_branch: 'master', | ||
| jenkins_slave_label: 'kitchen-slave', | ||
| nox_env_name: 'runtests-zeromq', | ||
| nox_passthrough_opts: '--ssh-tests', | ||
| python_version: 'py2', | ||
| testrun_timeout: 6, | ||
| use_spot_instances: true) | ||
|
|
||
| // vim: ft=groovy |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,16 @@ | ||
| @Library('salt@master-1.3') _ | ||
| @Library('salt@master-1.5') _ | ||
|
|
||
| // Define the maximum time, in hours, that a test run should run for | ||
| def testrun_timeout = 6 | ||
|
|
||
| def distro_name = 'amazon' | ||
| def distro_version = '2' | ||
| def python_version = 'py3' | ||
| def nox_env_name = 'runtests-zeromq' | ||
| def golden_images_branch = 'master' | ||
| def nox_passthrough_opts = '--ssh-tests' | ||
| def concurrent_builds = 1 | ||
| def use_spot_instances = true | ||
| def jenkins_slave_label = 'kitchen-slave' | ||
|
|
||
| properties([ | ||
| buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30')), | ||
| parameters([ | ||
| booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull') | ||
| ]) | ||
| ]) | ||
|
|
||
| // Only set milestones on PR builds | ||
| if (env.CHANGE_ID) { | ||
| // Be sure to cancel any previously running builds | ||
| def buildNumber = env.BUILD_NUMBER as int | ||
| if (buildNumber > concurrent_builds) { | ||
| // This will cancel the previous build which also defined a matching milestone | ||
| milestone(buildNumber - concurrent_builds) | ||
| } | ||
| // Define a milestone for this build so that, if another build starts, this one will be aborted | ||
| milestone(buildNumber) | ||
| } | ||
|
|
||
| runTests( | ||
| runTestSuite( | ||
| concurrent_builds: 1, | ||
| distro_name: 'amazon', | ||
| distro_version: '2', | ||
| env: env, | ||
| distro_name: distro_name, | ||
| distro_version: distro_version, | ||
| python_version: python_version, | ||
| golden_images_branch: golden_images_branch, | ||
| nox_env_name: nox_env_name, | ||
| nox_passthrough_opts: nox_passthrough_opts, | ||
| testrun_timeout: testrun_timeout, | ||
| run_full: params.runFull, | ||
| use_spot_instances: use_spot_instances, | ||
| jenkins_slave_label: jenkins_slave_label) | ||
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,16 @@ | ||
| @Library('salt@master-1.3') _ | ||
| @Library('salt@master-1.5') _ | ||
|
|
||
| // Define the maximum time, in hours, that a test run should run for | ||
| def testrun_timeout = 6 | ||
|
|
||
| def distro_name = 'arch' | ||
| def distro_version = 'lts' | ||
| def python_version = 'py2' | ||
| def nox_env_name = 'runtests-zeromq' | ||
| def golden_images_branch = 'master' | ||
| def nox_passthrough_opts = '-n integration.modules.test_pkg' | ||
| def concurrent_builds = 1 | ||
| def use_spot_instances = true | ||
| def jenkins_slave_label = 'kitchen-slave' | ||
|
|
||
| properties([ | ||
| buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30')), | ||
| parameters([ | ||
| booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull') | ||
| ]) | ||
| ]) | ||
|
|
||
| // Only set milestones on PR builds | ||
| if (env.CHANGE_ID) { | ||
| // Be sure to cancel any previously running builds | ||
| def buildNumber = env.BUILD_NUMBER as int | ||
| if (buildNumber > concurrent_builds) { | ||
| // This will cancel the previous build which also defined a matching milestone | ||
| milestone(buildNumber - concurrent_builds) | ||
| } | ||
| // Define a milestone for this build so that, if another build starts, this one will be aborted | ||
| milestone(buildNumber) | ||
| } | ||
|
|
||
| runTests( | ||
| runTestSuite( | ||
| concurrent_builds: 1, | ||
| distro_name: 'arch', | ||
| distro_version: 'lts', | ||
| env: env, | ||
| distro_name: distro_name, | ||
| distro_version: distro_version, | ||
| python_version: python_version, | ||
| golden_images_branch: golden_images_branch, | ||
| nox_env_name: nox_env_name, | ||
| nox_passthrough_opts: nox_passthrough_opts, | ||
| testrun_timeout: testrun_timeout, | ||
| run_full: params.runFull, | ||
| use_spot_instances: use_spot_instances, | ||
| jenkins_slave_label: jenkins_slave_label) | ||
| golden_images_branch: 'master', | ||
| jenkins_slave_label: 'kitchen-slave', | ||
| nox_env_name: 'runtests-zeromq', | ||
| nox_passthrough_opts: '-n integration.modules.test_pkg', | ||
| python_version: 'py2', | ||
| testrun_timeout: 6, | ||
| use_spot_instances: true) | ||
|
|
||
| // vim: ft=groovy |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,16 @@ | ||
| @Library('salt@master-1.3') _ | ||
| @Library('salt@master-1.5') _ | ||
|
|
||
| // Define the maximum time, in hours, that a test run should run for | ||
| def testrun_timeout = 6 | ||
|
|
||
| def distro_name = 'arch' | ||
| def distro_version = 'lts' | ||
| def python_version = 'py3' | ||
| def nox_env_name = 'runtests-zeromq' | ||
| def golden_images_branch = 'master' | ||
| def nox_passthrough_opts = '-n integration.modules.test_pkg' | ||
| def concurrent_builds = 1 | ||
| def use_spot_instances = true | ||
| def jenkins_slave_label = 'kitchen-slave' | ||
|
|
||
| properties([ | ||
| buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30')), | ||
| parameters([ | ||
| booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull') | ||
| ]) | ||
| ]) | ||
|
|
||
| // Only set milestones on PR builds | ||
| if (env.CHANGE_ID) { | ||
| // Be sure to cancel any previously running builds | ||
| def buildNumber = env.BUILD_NUMBER as int | ||
| if (buildNumber > concurrent_builds) { | ||
| // This will cancel the previous build which also defined a matching milestone | ||
| milestone(buildNumber - concurrent_builds) | ||
| } | ||
| // Define a milestone for this build so that, if another build starts, this one will be aborted | ||
| milestone(buildNumber) | ||
| } | ||
|
|
||
| runTests( | ||
| runTestSuite( | ||
| concurrent_builds: 1, | ||
| distro_name: 'arch', | ||
| distro_version: 'lts', | ||
| env: env, | ||
| distro_name: distro_name, | ||
| distro_version: distro_version, | ||
| python_version: python_version, | ||
| golden_images_branch: golden_images_branch, | ||
| nox_env_name: nox_env_name, | ||
| nox_passthrough_opts: nox_passthrough_opts, | ||
| testrun_timeout: testrun_timeout, | ||
| run_full: params.runFull, | ||
| use_spot_instances: use_spot_instances, | ||
| jenkins_slave_label: jenkins_slave_label) | ||
| golden_images_branch: 'master', | ||
| jenkins_slave_label: 'kitchen-slave', | ||
| nox_env_name: 'runtests-zeromq', | ||
| nox_passthrough_opts: '-n integration.modules.test_pkg', | ||
| python_version: 'py3', | ||
| testrun_timeout: 6, | ||
| use_spot_instances: true) | ||
|
|
||
| // vim: ft=groovy |
Oops, something went wrong.