Merge pull request #53610 from s0undt3ch/hotfix/fix-nox-bypass-2019.2

CI Pipelines. Timeout after getting a node.
saltstack · Jun 27, 2019 · 797c69e · 797c69e
2 parents 6229d7f + 0792fa4
commit 797c69e
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git 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-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',

diff --git 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',

diff --git 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',

diff --git 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',

diff --git 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',

diff --git 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',

diff --git 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 {