瀏覽代碼

[Jenkins] Add missing timeouts to apps on all pipelines

Dmitrii Kuvaiskii 5 年之前
父節點
當前提交
c43cb19179
共有 6 個文件被更改,包括 170 次插入126 次删除
  1. 30 22
      Jenkinsfiles/Linux
  2. 30 22
      Jenkinsfiles/Linux-18.04
  3. 30 22
      Jenkinsfiles/Linux-Debug
  4. 30 22
      Jenkinsfiles/Linux-Debug-18.04
  5. 25 19
      Jenkinsfiles/Linux-SGX-18.04-apps
  6. 25 19
      Jenkinsfiles/Linux-SGX-apps

+ 30 - 22
Jenkinsfiles/Linux

@@ -56,10 +56,12 @@ pipeline {
                                 make check
                             '''
                         }
-                        sh '''
-                            cd LibOS/shim/test/apps/bash
-                            make regression
+                        timeout(time: 5, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/bash
+                                make regression
                             '''
+                        }
                         timeout(time: 5, unit: 'MINUTES') {
                             sh '''
                                 cd LibOS/shim/test/apps/curl
@@ -87,28 +89,34 @@ pipeline {
                                 ./src/src/redis-benchmark
                             '''
                         }
-                        sh '''
-                            cd LibOS/shim/test/apps/lighttpd
-                            make
-                            make start-graphene-server &
-                            sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8003
+                        timeout(time: 10, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/lighttpd
+                                make
+                                make start-graphene-server &
+                                sleep 1
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8003
                             '''
-                        sh '''
-                            cd LibOS/shim/test/apps/nginx
-                            make
-                            make start-graphene-server &
-                            sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8002
+                        }
+                        timeout(time: 10, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/nginx
+                                make
+                                make start-graphene-server &
+                                sleep 1
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8002
                             '''
-                        sh '''
-                            cd LibOS/shim/test/apps/apache
-                            make
-                            make start-graphene-server &
-                            sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
+                        }
+                        timeout(time: 20, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/apache
+                                make
+                                make start-graphene-server &
+                                sleep 1
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
                             '''
+                        }
                         sh '''
                            cd "$(./Scripts/clean-check-test-copy)"
 

+ 30 - 22
Jenkinsfiles/Linux-18.04

@@ -54,10 +54,12 @@ pipeline {
                                 PYTHONVERSION=python3.6 make check
                             '''
                         }
-                        sh '''
-                            cd LibOS/shim/test/apps/bash
-                            make regression
+                        timeout(time: 5, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/bash
+                                make regression
                             '''
+                        }
                         timeout(time: 5, unit: 'MINUTES') {
                             sh '''
                                 cd LibOS/shim/test/apps/curl
@@ -85,28 +87,34 @@ pipeline {
                                 ./src/src/redis-benchmark
                             '''
                         }
-                        sh '''
-                            cd LibOS/shim/test/apps/lighttpd
-                            make
-                            make start-graphene-server &
-                            sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8003
+                        timeout(time: 10, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/lighttpd
+                                make
+                                make start-graphene-server &
+                                sleep 1
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8003
                             '''
-                        sh '''
-                            cd LibOS/shim/test/apps/nginx
-                            make
-                            make start-graphene-server &
-                            sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8002
+                        }
+                        timeout(time: 10, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/nginx
+                                make
+                                make start-graphene-server &
+                                sleep 1
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8002
                             '''
-                        sh '''
-                            cd LibOS/shim/test/apps/apache
-                            make
-                            make start-graphene-server &
-                            sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
+                        }
+                        timeout(time: 20, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/apache
+                                make
+                                make start-graphene-server &
+                                sleep 1
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
                             '''
+                        }
                         sh '''
                            cd "$(./Scripts/clean-check-test-copy)"
 

+ 30 - 22
Jenkinsfiles/Linux-Debug

@@ -55,10 +55,12 @@ pipeline {
                                 make check
                             '''
                         }
-                        sh '''
-                            cd LibOS/shim/test/apps/bash
-                            make regression
+                        timeout(time: 5, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/bash
+                                make regression
                             '''
+                        }
                         timeout(time: 5, unit: 'MINUTES') {
                             sh '''
                                 cd LibOS/shim/test/apps/curl
@@ -86,28 +88,34 @@ pipeline {
                                 ./src/src/redis-benchmark
                             '''
                         }
-                        sh '''
-                            cd LibOS/shim/test/apps/lighttpd
-                            make
-                            make start-graphene-server &
-                            sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8003
+                        timeout(time: 10, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/lighttpd
+                                make
+                                make start-graphene-server &
+                                sleep 1
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8003
                             '''
-                        sh '''
-                            cd LibOS/shim/test/apps/nginx
-                            make
-                            make start-graphene-server &
-                            sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8002
+                        }
+                        timeout(time: 10, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/nginx
+                                make
+                                make start-graphene-server &
+                                sleep 1
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8002
                             '''
-                        sh '''
-                            cd LibOS/shim/test/apps/apache
-                            make
-                            make start-graphene-server &
-                            sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
+                        }
+                        timeout(time: 20, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/apache
+                                make
+                                make start-graphene-server &
+                                sleep 1
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
                             '''
+                        }
                         sh '''
                            cd "$(./Scripts/clean-check-test-copy)"
 

+ 30 - 22
Jenkinsfiles/Linux-Debug-18.04

@@ -54,10 +54,12 @@ pipeline {
                                 PYTHONVERSION=python3.6 make check
                             '''
                         }
-                        sh '''
-                            cd LibOS/shim/test/apps/bash
-                            make regression
+                        timeout(time: 5, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/bash
+                                make regression
                             '''
+                        }
                         timeout(time: 5, unit: 'MINUTES') {
                             sh '''
                                 cd LibOS/shim/test/apps/curl
@@ -85,28 +87,34 @@ pipeline {
                                 ./src/src/redis-benchmark
                             '''
                         }
-                        sh '''
-                            cd LibOS/shim/test/apps/lighttpd
-                            make
-                            make start-graphene-server &
-                            sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8003
+                        timeout(time: 10, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/lighttpd
+                                make
+                                make start-graphene-server &
+                                sleep 1
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8003
                             '''
-                        sh '''
-                            cd LibOS/shim/test/apps/nginx
-                            make
-                            make start-graphene-server &
-                            sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8002
+                        }
+                        timeout(time: 10, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/nginx
+                                make
+                                make start-graphene-server &
+                                sleep 1
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8002
                             '''
-                        sh '''
-                            cd LibOS/shim/test/apps/apache
-                            make
-                            make start-graphene-server &
-                            sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
+                        }
+                        timeout(time: 20, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/apache
+                                make
+                                make start-graphene-server &
+                                sleep 1
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
                             '''
+                        }
                         sh '''
                            cd "$(./Scripts/clean-check-test-copy)"
 

+ 25 - 19
Jenkinsfiles/Linux-SGX-18.04-apps

@@ -94,28 +94,34 @@ pipeline {
                                 ./src/src/redis-benchmark
                             '''
                         }
-                        sh '''
-                            cd LibOS/shim/test/apps/lighttpd
-                            make SGX=1
-                            make SGX=1 start-graphene-server &
-                            sleep 10
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8003
+                        timeout(time: 15, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/lighttpd
+                                make SGX=1
+                                make SGX=1 start-graphene-server &
+                                sleep 10
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8003
                             '''
-                        sh '''
-                            cd LibOS/shim/test/apps/nginx
-                            make SGX=1
-                            make SGX=1 start-graphene-server &
-                            sleep 30
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8002
+                        }
+                        timeout(time: 15, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/nginx
+                                make SGX=1
+                                make SGX=1 start-graphene-server &
+                                sleep 30
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8002
                             '''
-                        sh '''
-                            cd LibOS/shim/test/apps/apache
-                            make SGX=1
-                            make SGX=1 start-graphene-server &
-                            sleep 30
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
+                        }
+                        timeout(time: 25, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/apache
+                                make SGX=1
+                                make SGX=1 start-graphene-server &
+                                sleep 30
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
                             '''
+                        }
                         sh '''
                            cd "$(./Scripts/clean-check-test-copy)"
 

+ 25 - 19
Jenkinsfiles/Linux-SGX-apps

@@ -91,28 +91,34 @@ pipeline {
                                 ./src/src/redis-benchmark
                             '''
                         }
-                        sh '''
-                            cd LibOS/shim/test/apps/lighttpd
-                            make SGX=1
-                            make SGX=1 start-graphene-server &
-                            sleep 10
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8003
+                        timeout(time: 15, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/lighttpd
+                                make SGX=1
+                                make SGX=1 start-graphene-server &
+                                sleep 10
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8003
                             '''
-                        sh '''
-                            cd LibOS/shim/test/apps/nginx
-                            make SGX=1
-                            make SGX=1 start-graphene-server &
-                            sleep 30
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8002
+                        }
+                        timeout(time: 15, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/nginx
+                                make SGX=1
+                                make SGX=1 start-graphene-server &
+                                sleep 30
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8002
                             '''
-                        sh '''
-                            cd LibOS/shim/test/apps/apache
-                            make SGX=1
-                            make SGX=1 start-graphene-server &
-                            sleep 30
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
+                        }
+                        timeout(time: 25, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/apache
+                                make SGX=1
+                                make SGX=1 start-graphene-server &
+                                sleep 30
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
+                                LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
                             '''
+                        }
                         sh '''
                            cd "$(./Scripts/clean-check-test-copy)"