Browse Source

[Jenkins] Add Redis test to all Jenkins pipelines

Redis is tested with select() syscall on 16.04 pipelines and with
epoll() on 18.04 pipelines.
Dmitrii Kuvaiskii 4 years ago
parent
commit
b4673dc171

+ 10 - 0
Jenkinsfiles/Linux

@@ -79,6 +79,15 @@ pipeline {
                                 make test N_RUNS=1 ENOUGH=100
                             '''
                         }
+                        timeout(time: 10, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/redis
+                                make USE_SELECT=1
+                                make start-graphene-server &
+                                sleep 1
+                                ./src/src/redis-benchmark
+                            '''
+                        }
                         sh '''
                             cd LibOS/shim/test/apps/lighttpd
                             make
@@ -120,6 +129,7 @@ pipeline {
                            make -C LibOS/shim/test/apps/curl clean
                            make -C LibOS/shim/test/apps/gcc clean
                            make -C LibOS/shim/test/apps/lmbench distclean
+                           make -C LibOS/shim/test/apps/redis distclean
                            make -C LibOS/shim/test/apps/lighttpd distclean
                            make -C LibOS/shim/test/apps/nginx distclean
                            make -C LibOS/shim/test/apps/apache distclean

+ 9 - 0
Jenkinsfiles/Linux-18.04

@@ -78,6 +78,15 @@ pipeline {
                                 make test N_RUNS=1 ENOUGH=100
                             '''
                         }
+                        timeout(time: 10, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/redis
+                                make
+                                make start-graphene-server &
+                                sleep 1
+                                ./src/src/redis-benchmark
+                            '''
+                        }
                         sh '''
                             cd LibOS/shim/test/apps/lighttpd
                             make

+ 10 - 0
Jenkinsfiles/Linux-Debug

@@ -77,6 +77,15 @@ pipeline {
                                 make test N_RUNS=1 ENOUGH=100
                             '''
                         }
+                        timeout(time: 10, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/redis
+                                make USE_SELECT=1
+                                make start-graphene-server &
+                                sleep 1
+                                ./src/src/redis-benchmark
+                            '''
+                        }
                         sh '''
                             cd LibOS/shim/test/apps/lighttpd
                             make
@@ -116,6 +125,7 @@ pipeline {
                            make -C LibOS/shim/test/apps/curl clean
                            make -C LibOS/shim/test/apps/gcc clean
                            make -C LibOS/shim/test/apps/lmbench distclean
+                           make -C LibOS/shim/test/apps/redis distclean
                            make -C LibOS/shim/test/apps/lighttpd distclean
                            make -C LibOS/shim/test/apps/nginx distclean
                            make -C LibOS/shim/test/apps/apache distclean

+ 9 - 0
Jenkinsfiles/Linux-Debug-18.04

@@ -75,6 +75,15 @@ pipeline {
                                 make test N_RUNS=1 ENOUGH=100
                             '''
                         }
+                        timeout(time: 10, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/redis
+                                make
+                                make start-graphene-server &
+                                sleep 1
+                                ./src/src/redis-benchmark
+                            '''
+                        }
                         sh '''
                             cd LibOS/shim/test/apps/lighttpd
                             make

+ 9 - 0
Jenkinsfiles/Linux-SGX-18.04-apps

@@ -82,6 +82,15 @@ pipeline {
                                 make SGX=1 test N_RUNS=1 ENOUGH=100
                             '''
                         }
+                        timeout(time: 15, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/redis
+                                make SGX=1
+                                make SGX=1 start-graphene-server &
+                                sleep 30
+                                ./src/src/redis-benchmark
+                            '''
+                        }
                         sh '''
                             cd LibOS/shim/test/apps/lighttpd
                             make SGX=1

+ 10 - 0
Jenkinsfiles/Linux-SGX-apps

@@ -82,6 +82,15 @@ pipeline {
                                 make SGX=1 test N_RUNS=1 ENOUGH=100
                             '''
                         }
+                        timeout(time: 15, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/redis
+                                make SGX=1 USE_SELECT=1
+                                make SGX=1 start-graphene-server &
+                                sleep 30
+                                ./src/src/redis-benchmark
+                            '''
+                        }
                         sh '''
                             cd LibOS/shim/test/apps/lighttpd
                             make SGX=1
@@ -117,6 +126,7 @@ pipeline {
                            make -C LibOS/shim/test/apps/curl SGX=1 clean
                            make -C LibOS/shim/test/apps/gcc SGX=1 clean
                            make -C LibOS/shim/test/apps/lmbench SGX=1 distclean
+                           make -C LibOS/shim/test/apps/redis SGX=1 distclean
                            make -C LibOS/shim/test/apps/lighttpd SGX=1 distclean
                            make -C LibOS/shim/test/apps/nginx SGX=1 distclean
                            make -C LibOS/shim/test/apps/apache SGX=1 distclean

+ 1 - 1
LibOS/shim/test/apps

@@ -1 +1 @@
-Subproject commit 4f40531250d5a9e18ecf3148fc5804fd14e6b293
+Subproject commit dfb8e3abf10e9cdbb4c74647d288140b70abd983