Przeglądaj źródła

[Jenkins] Tune the run time of Apache and Lighttpd tests

Chia-Che Tsai 4 lat temu
rodzic
commit
8b1ae05125

+ 2 - 2
Jenkinsfiles/Linux

@@ -53,14 +53,14 @@ pipeline {
                             make
                             make start-graphene-server &
                             sleep 1
-                            ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
                             '''
                         sh '''
                             cd LibOS/shim/test/apps/apache
                             make
                             make start-graphene-server &
                             sleep 1
-                            ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
                             '''
                     }
                 }

+ 2 - 2
Jenkinsfiles/Linux-18.04

@@ -52,14 +52,14 @@ pipeline {
                             make
                             make start-graphene-server &
                             sleep 1
-                            ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
                             '''
                         sh '''
                             cd LibOS/shim/test/apps/apache
                             make
                             make start-graphene-server &
                             sleep 1
-                            ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
                             '''
                     }
                 }

+ 2 - 2
Jenkinsfiles/Linux-Debug

@@ -53,14 +53,14 @@ pipeline {
                             make
                             make start-graphene-server &
                             sleep 1
-                            ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
                             '''
                         sh '''
                             cd LibOS/shim/test/apps/apache
                             make
                             make start-graphene-server &
                             sleep 1
-                            ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
                             '''
                     }
                 }

+ 2 - 2
Jenkinsfiles/Linux-Debug-18.04

@@ -52,14 +52,14 @@ pipeline {
                             make
                             make start-graphene-server &
                             sleep 1
-                            ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
                             '''
                         sh '''
                             cd LibOS/shim/test/apps/apache
                             make
                             make start-graphene-server &
                             sleep 1
-                            ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
                             '''
                     }
                 }

+ 3 - 2
Jenkinsfiles/Linux-SGX

@@ -86,7 +86,7 @@ pipeline {
                             make SGX_RUN=1
                             make SGX_RUN=1 start-graphene-server &
                             sleep 10
-                            ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
                             '''
                             /*
                         sh '''
@@ -94,7 +94,8 @@ pipeline {
                             make SGX=1
                             make SGX_RUN=1
                             make SGX_RUN=1 start-graphene-server &
-                            sleep 15 && ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
+                            sleep 15
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
                             '''
                             */
                     }

+ 3 - 2
Jenkinsfiles/Linux-SGX-18.04

@@ -86,7 +86,7 @@ pipeline {
                             make SGX_RUN=1
                             make SGX_RUN=1 start-graphene-server &
                             sleep 10
-                            ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
                             '''
                             /*
                         sh '''
@@ -94,7 +94,8 @@ pipeline {
                             make SGX=1
                             make SGX_RUN=1
                             make SGX_RUN=1 start-graphene-server &
-                            sleep 15 && ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
+                            sleep 15
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
                             '''
                             */
                     }

+ 1 - 1
LibOS/shim/test/apps

@@ -1 +1 @@
-Subproject commit cad9612ea22692781e4da0b0f2fcd0086ddeca57
+Subproject commit 3f0b8a569dda3099a5e7339a08e17cf3695054ad