valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 08:35:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2019.2.1' into tcp_leak

Browse Source
This commit is contained in:
Daniel Wozniak 2019-06-27 09:25:09 -07:00 committed by GitHub
commit 3125cd3e66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/docs
View File

@ -8,8 +8,8 @@ properties([
def shell_header def shell_header
timeout(time: global_timeout, unit: 'HOURS') { node('docs') {
node('docs') { timeout(time: global_timeout, unit: 'HOURS') {
ansiColor('xterm') { ansiColor('xterm') {
timestamps { timestamps {
try { try {

10
.ci/kitchen-centos6-py2
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

10
.ci/kitchen-centos7-py2
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

10
.ci/kitchen-centos7-py3
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

10
.ci/kitchen-debian8-py2
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

10
.ci/kitchen-debian8-py3
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

10
.ci/kitchen-debian9-py2
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

10
.ci/kitchen-debian9-py3
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

10
.ci/kitchen-fedora29-py2
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

10
.ci/kitchen-fedora29-py3
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

10
.ci/kitchen-ubuntu1604-py2
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

10
.ci/kitchen-ubuntu1604-py3
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

10
.ci/kitchen-ubuntu1804-py2
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

10
.ci/kitchen-ubuntu1804-py3
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

10
.ci/kitchen-windows2016-py2
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

10
.ci/kitchen-windows2016-py3
View File

@ -17,8 +17,8 @@ properties([
]) ])
]) ])
timeout(time: global_timeout, unit: 'HOURS') { node('kitchen-slave') {
node('kitchen-slave') { timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
accessKeyVariable: 'AWS_ACCESS_KEY_ID', accessKeyVariable: 'AWS_ACCESS_KEY_ID',
credentialsId: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID',
@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
stage('checkout-scm') { stage('checkout-scm') {
cleanWs notFailBuild: true cleanWs notFailBuild: true
checkout scm checkout scm
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
} }
// Setup the kitchen required bundle // Setup the kitchen required bundle
stage('setup-bundle') { stage('setup-bundle') {
sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant' sh 'bundle install --with ec2 windows --without docker macos opennebula vagrant'
} }
@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') {
try { try {
timeout(time: testrun_timeout, unit: 'HOURS') { timeout(time: testrun_timeout, unit: 'HOURS') {
stage('Converge VM') { stage('Converge VM') {
sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
stage('Run Tests') { stage('Run Tests') {
withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) { withEnv(["DONT_DOWNLOAD_ARTEFACTS=1"]) {
sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM; echo "ExitCode: $?;"'
} }
} }
} }

4
.ci/lint
View File

@ -8,8 +8,8 @@ properties([
def shell_header def shell_header
timeout(time: global_timeout, unit: 'HOURS') { node('lint') {
node('lint') { timeout(time: global_timeout, unit: 'HOURS') {
ansiColor('xterm') { ansiColor('xterm') {
timestamps { timestamps {
try { try {