From 904f827df0e7b8c67b00635e4ecbf0433a9297a8 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 16 May 2021 15:33:35 -0400
Subject: [PATCH] Jenkins: increase timeout and build history

---
 .ci/Jenkinsfile-compile  |  2 +-
 .ci/Jenkinsfile-hardware | 62 +++++++++-------------------------------
 Jenkinsfile              |  4 +--
 3 files changed, 16 insertions(+), 52 deletions(-)

diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile
index 6ea07cf989..c601881000 100644
--- a/.ci/Jenkinsfile-compile
+++ b/.ci/Jenkinsfile-compile
@@ -157,7 +157,7 @@ pipeline {
   }
   options {
     buildDiscarder(logRotator(numToKeepStr: '5', artifactDaysToKeepStr: '14'))
-    timeout(time: 60, unit: 'MINUTES')
+    timeout(time: 90, unit: 'MINUTES')
   }
 }
 
diff --git a/.ci/Jenkinsfile-hardware b/.ci/Jenkinsfile-hardware
index a46bd8a0d3..4ae8c92aae 100644
--- a/.ci/Jenkinsfile-hardware
+++ b/.ci/Jenkinsfile-hardware
@@ -73,13 +73,10 @@ pipeline {
                 }
                 stage("reset") {
                   steps {
-                    cleanupFTDI();
+                    cleanupFTDI()
                   }
                 }
               }
-              options {
-                timeout(time: 90, unit: 'MINUTES')
-              }
             } // stage test
           }
         }
@@ -149,13 +146,10 @@ pipeline {
                 }
                 stage("reset") {
                   steps {
-                    cleanupFTDI();
+                    cleanupFTDI()
                   }
                 }
               }
-              options {
-                timeout(time: 90, unit: 'MINUTES')
-              }
             } // stage test
           }
         }
@@ -225,13 +219,10 @@ pipeline {
                 }
                 stage("reset") {
                   steps {
-                    cleanupFTDI();
+                    cleanupFTDI()
                   }
                 }
               }
-              options {
-                timeout(time: 90, unit: 'MINUTES')
-              }
             } // stage test
           }
         }
@@ -301,13 +292,10 @@ pipeline {
                 }
                 stage("reset") {
                   steps {
-                    cleanupFTDI();
+                    cleanupFTDI()
                   }
                 }
               }
-              options {
-                timeout(time: 90, unit: 'MINUTES')
-              }
             } // stage test
           }
         }
@@ -377,13 +365,10 @@ pipeline {
                 }
                 stage("reset") {
                   steps {
-                    cleanupFTDI();
+                    cleanupFTDI()
                   }
                 }
               }
-              options {
-                timeout(time: 90, unit: 'MINUTES')
-              }
             } // stage test
           }
         }
@@ -453,13 +438,10 @@ pipeline {
                 }
                 stage("reset") {
                   steps {
-                    cleanupFTDI();
+                    cleanupFTDI()
                   }
                 }
               }
-              options {
-                timeout(time: 90, unit: 'MINUTES')
-              }
             } // stage test
           }
         }
@@ -533,13 +515,10 @@ pipeline {
                 }
                 stage("reset") {
                   steps {
-                    cleanupFTDI();
+                    cleanupFTDI()
                   }
                 }
               }
-              options {
-                timeout(time: 90, unit: 'MINUTES')
-              }
             } // stage test
           }
         }
@@ -609,13 +588,10 @@ pipeline {
                 }
                 stage("reset") {
                   steps {
-                    cleanupFTDI();
+                    cleanupFTDI()
                   }
                 }
               }
-              options {
-                timeout(time: 90, unit: 'MINUTES')
-              }
             } // stage test
           }
         }
@@ -689,13 +665,10 @@ pipeline {
                 }
                 stage("reset") {
                   steps {
-                    cleanupFTDI();
+                    cleanupFTDI()
                   }
                 }
               }
-              options {
-                timeout(time: 90, unit: 'MINUTES')
-              }
             } // stage test
           }
         }
@@ -769,9 +742,6 @@ pipeline {
                   }
                 }
               }
-              options {
-                timeout(time: 90, unit: 'MINUTES')
-              }
             } // stage test
           }
         }
@@ -842,13 +812,10 @@ pipeline {
                 }
                 stage("reset") {
                   steps {
-                    cleanupFTDI();
+                    cleanupFTDI()
                   }
                 }
               }
-              options {
-                timeout(time: 90, unit: 'MINUTES')
-              }
             } // stage test
           }
         }
@@ -918,13 +885,10 @@ pipeline {
                 }
                 stage("reset") {
                   steps {
-                    cleanupFTDI();
+                    cleanupFTDI()
                   }
                 }
               }
-              options {
-                timeout(time: 90, unit: 'MINUTES')
-              }
             } // stage test
           }
         }
@@ -937,8 +901,8 @@ pipeline {
     CI = true
   }
   options {
-    buildDiscarder(logRotator(numToKeepStr: '20', artifactDaysToKeepStr: '40'))
-    timeout(time: 90, unit: 'MINUTES')
+    buildDiscarder(logRotator(numToKeepStr: '30', artifactDaysToKeepStr: '60'))
+    timeout(time: 120, unit: 'MINUTES')
     skipDefaultCheckout()
   }
 }
diff --git a/Jenkinsfile b/Jenkinsfile
index 65ebd54f6c..77d945643a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -374,7 +374,7 @@ pipeline {
     GIT_COMMITTER_NAME = "PX4BuildBot"
   }
   options {
-    buildDiscarder(logRotator(numToKeepStr: '10', artifactDaysToKeepStr: '20'))
-    timeout(time: 60, unit: 'MINUTES')
+    buildDiscarder(logRotator(numToKeepStr: '20', artifactDaysToKeepStr: '30'))
+    timeout(time: 90, unit: 'MINUTES')
   }
 }