ci: move timeouts closer to running test

Signed-off-by: Vitor Bandeira <[email protected]>
vvbandeira · Nov 21, 2024 · fde52dc · fde52dc
1 parent 7c8114b
commit fde52dc
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 57 deletions.
diff --git a/jenkins/Jenkinsfile.coverage b/jenkins/Jenkinsfile.coverage
@@ -1,49 +1,49 @@
 @Library('[email protected]') _
 
-timeout(time: 2, unit: 'HOURS') {
-    node {
+node {
 
-        stage('Checkout'){
-            checkout scm;
-        }
+    stage('Checkout'){
+        checkout scm;
+    }
 
-        def DOCKER_IMAGE;
-        stage('Build and Push Docker Image') {
-            DOCKER_IMAGE = dockerPush('ubuntu22.04', 'openroad');
-            echo "Docker image is ${DOCKER_IMAGE}";
-        }
+    def DOCKER_IMAGE;
+    stage('Build and Push Docker Image') {
+        DOCKER_IMAGE = dockerPush('ubuntu22.04', 'openroad');
+        echo "Docker image is ${DOCKER_IMAGE}";
+    }
 
-        docker.image(DOCKER_IMAGE).inside('--user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock') {
-            stage('Build for Coverage') {
-                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                    sh label: 'Build OpenROAD', script: './etc/Build.sh -no-warnings -coverage';
-                }
+    docker.image(DOCKER_IMAGE).inside('--user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock') {
+        stage('Build for Coverage') {
+            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                sh label: 'Build OpenROAD', script: './etc/Build.sh -no-warnings -coverage';
             }
+        }
 
-            stage('Dynamic Code Coverage') {
-                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+        stage('Dynamic Code Coverage') {
+            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                timeout(time: 2, unit: 'HOURS') {
                     sh './etc/CodeCoverage.sh dynamic';
                 }
             }
-
-            stage('Publish Code Coverage') {
-                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                    publishHTML([
-                            allowMissing: false,
-                            alwaysLinkToLastBuild: false,
-                            keepAll: false,
-                            reportDir: 'coverage-output',
-                            reportFiles: 'index.html',
-                            reportName: 'Dynamic Code Coverage',
-                            reportTitles: ''
-                    ]);
-                }
-            }
         }
 
-        stage('Send Email Report') {
-            sendEmail();
+        stage('Publish Code Coverage') {
+            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                publishHTML([
+                        allowMissing: false,
+                        alwaysLinkToLastBuild: false,
+                        keepAll: false,
+                        reportDir: 'coverage-output',
+                        reportFiles: 'index.html',
+                        reportName: 'Dynamic Code Coverage',
+                        reportTitles: ''
+                ]);
+            }
         }
+    }
 
+    stage('Send Email Report') {
+        sendEmail();
     }
+
 }
diff --git a/jenkins/Jenkinsfile.coverity b/jenkins/Jenkinsfile.coverity
@@ -1,38 +1,38 @@
 @Library('[email protected]') _
 
-timeout(time: 2, unit: 'HOURS') {
-    node {
+node {
 
-        stage('Checkout'){
-            checkout scm;
-        }
+    stage('Checkout'){
+        checkout scm;
+    }
 
-        def DOCKER_IMAGE;
-        stage('Build and Push Docker Image') {
-            DOCKER_IMAGE = dockerPush('ubuntu22.04', 'openroad');
-            echo "Docker image is ${DOCKER_IMAGE}";
-        }
+    def DOCKER_IMAGE;
+    stage('Build and Push Docker Image') {
+        DOCKER_IMAGE = dockerPush('ubuntu22.04', 'openroad');
+        echo "Docker image is ${DOCKER_IMAGE}";
+    }
 
-        docker.image(DOCKER_IMAGE).inside('--user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock -v /home/jenkins/cov-latest:/root/cov-latest') {
-            stage("Setup") {
-                sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
-            }
-            stage('Run Static Code Coverage') {
-                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                    withCredentials([string(credentialsId: 'COVERITY_TOKEN', variable: 'TOKEN')]) {
+    docker.image(DOCKER_IMAGE).inside('--user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock -v /home/jenkins/cov-latest:/root/cov-latest') {
+        stage("Setup") {
+            sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
+        }
+        stage('Run Static Code Coverage') {
+            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                withCredentials([string(credentialsId: 'COVERITY_TOKEN', variable: 'TOKEN')]) {
+                    timeout(time: 2, unit: 'HOURS') {
                         sh label: 'CodeCoverage Script', script: '''
                             export PATH=/root/cov-latest/bin:$PATH
                             ./etc/CodeCoverage.sh static ${TOKEN}
                         ''';
                     }
                 }
-                archiveArtifacts artifacts: 'openroad.tgz';
             }
+            archiveArtifacts artifacts: 'openroad.tgz';
         }
+    }
 
-        stage('Send Email Report') {
-            sendEmail();
-        }
-
+    stage('Send Email Report') {
+        sendEmail();
     }
+
 }
diff --git a/jenkins/Jenkinsfile.nightly b/jenkins/Jenkinsfile.nightly
@@ -46,7 +46,9 @@ node {
                             }
                             stage("Run ${name}") {
                                 catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                                    sh "python3 src/drt/test/run-ispd.py --program ${WORKSPACE}/build/src/openroad --tests ispd${ispd_year}_test${test_to_run}";
+                                    timeout(time: 8, unit: 'HOURS') {
+                                        sh "python3 src/drt/test/run-ispd.py --program ${WORKSPACE}/build/src/openroad --tests ispd${ispd_year}_test${test_to_run}";
+                                    }
                                 }
                             }
                             stage("Save ${name} Results") {
@@ -68,7 +70,9 @@ node {
                     }
                     stage('Run GPL Tests') {
                         catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                            sh './src/gpl/test/regression-large';
+                            timeout(time: 2, unit: 'HOURS') {
+                                sh './src/gpl/test/regression-large';
+                            }
                         }
                     }
                     stage('Save GPL Results') {