From 024be8402440b378e93fc73fbb298c1b6900843c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 26 Jun 2019 16:52:28 +0100 Subject: [PATCH] CI Pipelines. Timeout after getting a node. Report exit code. --- .ci/docs | 4 ++-- .ci/kitchen-centos6-py2 | 10 +++++----- .ci/kitchen-centos7-py2 | 10 +++++----- .ci/kitchen-centos7-py3 | 10 +++++----- .ci/kitchen-debian8-py2 | 10 +++++----- .ci/kitchen-debian8-py3 | 10 +++++----- .ci/kitchen-debian9-py2 | 10 +++++----- .ci/kitchen-debian9-py3 | 10 +++++----- .ci/kitchen-fedora29-py2 | 10 +++++----- .ci/kitchen-fedora29-py3 | 10 +++++----- .ci/kitchen-ubuntu1604-py2 | 10 +++++----- .ci/kitchen-ubuntu1604-py3 | 10 +++++----- .ci/kitchen-ubuntu1804-py2 | 10 +++++----- .ci/kitchen-ubuntu1804-py3 | 10 +++++----- .ci/kitchen-windows2016-py2 | 10 +++++----- .ci/kitchen-windows2016-py3 | 10 +++++----- .ci/lint | 4 ++-- 17 files changed, 79 insertions(+), 79 deletions(-) diff --git a/.ci/docs b/.ci/docs index 158185367c..e062fac8d4 100644 --- a/.ci/docs +++ b/.ci/docs @@ -8,8 +8,8 @@ properties([ def shell_header -timeout(time: global_timeout, unit: 'HOURS') { - node('docs') { +node('docs') { + timeout(time: global_timeout, unit: 'HOURS') { ansiColor('xterm') { timestamps { try { diff --git a/.ci/kitchen-centos6-py2 b/.ci/kitchen-centos6-py2 index a6863f6e96..c933419980 100644 --- a/.ci/kitchen-centos6-py2 +++ b/.ci/kitchen-centos6-py2 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/kitchen-centos7-py2 b/.ci/kitchen-centos7-py2 index 629882b8c4..57bbbfbb6f 100644 --- a/.ci/kitchen-centos7-py2 +++ b/.ci/kitchen-centos7-py2 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3 index ef800a03c6..bfb7d8dfa9 100644 --- a/.ci/kitchen-centos7-py3 +++ b/.ci/kitchen-centos7-py3 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/kitchen-debian8-py2 b/.ci/kitchen-debian8-py2 index 3c77d0204b..19bb4f0d62 100644 --- a/.ci/kitchen-debian8-py2 +++ b/.ci/kitchen-debian8-py2 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/kitchen-debian8-py3 b/.ci/kitchen-debian8-py3 index 6296c99532..43e258cd1a 100644 --- a/.ci/kitchen-debian8-py3 +++ b/.ci/kitchen-debian8-py3 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/kitchen-debian9-py2 b/.ci/kitchen-debian9-py2 index fef99787ec..3f51c5dd8d 100644 --- a/.ci/kitchen-debian9-py2 +++ b/.ci/kitchen-debian9-py2 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/kitchen-debian9-py3 b/.ci/kitchen-debian9-py3 index 8aead159d7..5932cff8e8 100644 --- a/.ci/kitchen-debian9-py3 +++ b/.ci/kitchen-debian9-py3 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/kitchen-fedora29-py2 b/.ci/kitchen-fedora29-py2 index 41fd0eb0fa..667157159e 100644 --- a/.ci/kitchen-fedora29-py2 +++ b/.ci/kitchen-fedora29-py2 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/kitchen-fedora29-py3 b/.ci/kitchen-fedora29-py3 index 190d28de1d..7f91e3208f 100644 --- a/.ci/kitchen-fedora29-py3 +++ b/.ci/kitchen-fedora29-py3 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/kitchen-ubuntu1604-py2 b/.ci/kitchen-ubuntu1604-py2 index 2dbbf0868e..0252e23a2a 100644 --- a/.ci/kitchen-ubuntu1604-py2 +++ b/.ci/kitchen-ubuntu1604-py2 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/kitchen-ubuntu1604-py3 b/.ci/kitchen-ubuntu1604-py3 index aee662fe9e..7584b35408 100644 --- a/.ci/kitchen-ubuntu1604-py3 +++ b/.ci/kitchen-ubuntu1604-py3 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/kitchen-ubuntu1804-py2 b/.ci/kitchen-ubuntu1804-py2 index 258388147a..f4a7c2924d 100644 --- a/.ci/kitchen-ubuntu1804-py2 +++ b/.ci/kitchen-ubuntu1804-py2 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/kitchen-ubuntu1804-py3 b/.ci/kitchen-ubuntu1804-py3 index e4a1eb86d2..01bd7df6c7 100644 --- a/.ci/kitchen-ubuntu1804-py3 +++ b/.ci/kitchen-ubuntu1804-py3 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/kitchen-windows2016-py2 b/.ci/kitchen-windows2016-py2 index db207621e5..92b94805b8 100644 --- a/.ci/kitchen-windows2016-py2 +++ b/.ci/kitchen-windows2016-py2 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/kitchen-windows2016-py3 b/.ci/kitchen-windows2016-py3 index b19469d9bf..b24dbf0468 100644 --- a/.ci/kitchen-windows2016-py3 +++ b/.ci/kitchen-windows2016-py3 @@ -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', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', @@ -54,11 +54,11 @@ timeout(time: global_timeout, unit: 'HOURS') { stage('checkout-scm') { cleanWs notFailBuild: true 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 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' } @@ -76,11 +76,11 @@ timeout(time: global_timeout, unit: 'HOURS') { try { timeout(time: testrun_timeout, unit: 'HOURS') { 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') { 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: $?;"' } } } diff --git a/.ci/lint b/.ci/lint index 09e73f938e..3a4e1ae80b 100644 --- a/.ci/lint +++ b/.ci/lint @@ -8,8 +8,8 @@ properties([ def shell_header -timeout(time: global_timeout, unit: 'HOURS') { - node('lint') { +node('lint') { + timeout(time: global_timeout, unit: 'HOURS') { ansiColor('xterm') { timestamps { try {