Merge pull request jenkinsci#32 from slide/master

Increase timeout
boristsr · Nov 1, 2019 · 5aca818 · 5aca818
2 parents 644d1dd + b39106f
commit 5aca818
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,10 +3,9 @@
  * This is currently handled through Automated Builds using standard Docker Hub feature
 */
 pipeline {
-    agent { label 'linux' }
+    agent none
 
     options {
-        timeout(time: 2, unit: 'MINUTES')
         buildDiscarder(logRotator(daysToKeepStr: '10'))
         timestamps()
     }
@@ -22,8 +21,10 @@ pipeline {
                     agent {
                         label "windock"
                     }
+                    options {
+                        timeout(time: 60, unit: 'MINUTES')
+                    }
                     steps {
-                        deleteDir()
                         checkout scm
                         powershell "& ./make.ps1"
                     }
@@ -32,8 +33,10 @@ pipeline {
                     agent {
                         label "docker&&linux"
                     }
+                    options {
+                        timeout(time: 30, unit: 'MINUTES')
+                    }
                     steps {
-                        deleteDir()
                         checkout scm
                         sh "make build"
                     }