Browse Source

[Jenkins] Add Nginx test to all Jenkins pipelines

Dmitrii Kuvaiskii 4 years ago
parent
commit
73e9ed2e8a

+ 8 - 0
Jenkinsfiles/Linux

@@ -76,6 +76,13 @@ pipeline {
                             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
+                            '''
                         sh '''
                             cd LibOS/shim/test/apps/apache
                             make
@@ -104,6 +111,7 @@ pipeline {
                            make -C LibOS/shim/test/apps/gcc clean
                            make -C LibOS/shim/test/apps/lmbench clean
                            make -C LibOS/shim/test/apps/lighttpd distclean
+                           make -C LibOS/shim/test/apps/nginx distclean
                            make -C LibOS/shim/test/apps/apache distclean
                            make -C Pal/src PAL_HOST=Skeleton clean
 

+ 7 - 0
Jenkinsfiles/Linux-18.04

@@ -70,6 +70,13 @@ pipeline {
                             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
+                            '''
                         sh '''
                             cd LibOS/shim/test/apps/apache
                             make

+ 8 - 0
Jenkinsfiles/Linux-Debug

@@ -72,6 +72,13 @@ pipeline {
                             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
+                            '''
                         sh '''
                             cd LibOS/shim/test/apps/apache
                             make
@@ -98,6 +105,7 @@ pipeline {
                            make -C LibOS/shim/test/apps/gcc clean
                            make -C LibOS/shim/test/apps/lmbench clean
                            make -C LibOS/shim/test/apps/lighttpd distclean
+                           make -C LibOS/shim/test/apps/nginx distclean
                            make -C LibOS/shim/test/apps/apache distclean
                            make -C Pal/src PAL_HOST=Skeleton clean
 

+ 7 - 0
Jenkinsfiles/Linux-Debug-18.04

@@ -67,6 +67,13 @@ pipeline {
                             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
+                            '''
                         sh '''
                             cd LibOS/shim/test/apps/apache
                             make

+ 8 - 0
Jenkinsfiles/Linux-SGX

@@ -114,6 +114,13 @@ pipeline {
                             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
+                            '''
                         sh '''
                             cd LibOS/shim/test/apps/apache
                             make SGX=1
@@ -141,6 +148,7 @@ pipeline {
                            make -C LibOS/shim/test/apps/gcc SGX=1 clean
                            make -C LibOS/shim/test/apps/lmbench SGX=1 clean
                            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
 
                            ./Scripts/clean-check

+ 7 - 0
Jenkinsfiles/Linux-SGX-18.04

@@ -111,6 +111,13 @@ pipeline {
                             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
+                            '''
                             /*
                         sh '''
                             cd LibOS/shim/test/apps/apache

+ 2 - 0
Jenkinsfiles/ubuntu-16.04.dockerfile

@@ -37,6 +37,8 @@ RUN apt-get update \
        python3-scipy \
        texinfo \
        wget \
+       zlib1g \
+       zlib1g-dev \
     && /usr/bin/pip3 install protobuf \
 
 # Add the user UID:1001, GID:1001, home at /leeroy

+ 3 - 1
Jenkinsfiles/ubuntu-18.04.dockerfile

@@ -37,7 +37,9 @@ RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install -y \
     python3-pytest \
     python3-scipy \
     texinfo \
-    wget
+    wget \
+    zlib1g \
+    zlib1g-dev
 
 RUN pip3 install 'Sphinx>=1.8' sphinx_rtd_theme recommonmark
 

+ 1 - 1
LibOS/shim/test/apps

@@ -1 +1 @@
-Subproject commit b4401398f484d345c3a635be0505a6dac14e09ba
+Subproject commit 10fd09f449617baeaad67724e8c467604b687420