Browse Source

[Jenkins] Add blender app to Jenkins

borysp 4 years ago
parent
commit
a3305ed6b8

+ 7 - 0
Jenkinsfiles/Linux

@@ -117,6 +117,12 @@ pipeline {
                                 LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
                             '''
                         }
+                        timeout(time: 5, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/blender
+                                make check
+                            '''
+                        }
                         sh '''
                            # Workaround LTP bug (see https://github.com/linux-test-project/ltp/issues/560 for upstream fix):
                            git -C LibOS/shim/test/apps/ltp/src checkout -- utils/ffsb-6.0-rc2/config.h.in utils/ffsb-6.0-rc2/configure
@@ -146,6 +152,7 @@ pipeline {
                            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 LibOS/shim/test/apps/blender distclean
                            make -C Pal/src PAL_HOST=Skeleton clean
 
                            ./Scripts/clean-check

+ 7 - 0
Jenkinsfiles/Linux-18.04

@@ -115,6 +115,12 @@ pipeline {
                                 LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
                             '''
                         }
+                        timeout(time: 5, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/blender
+                                make check
+                           '''
+                        }
                         sh '''
                            # Workaround LTP bug (see https://github.com/linux-test-project/ltp/issues/560 for upstream fix):
                            git -C LibOS/shim/test/apps/ltp/src checkout -- utils/ffsb-6.0-rc2/config.h.in utils/ffsb-6.0-rc2/configure
@@ -142,6 +148,7 @@ pipeline {
                            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 LibOS/shim/test/apps/blender distclean
 
                            ./Scripts/clean-check
                         '''

+ 7 - 0
Jenkinsfiles/Linux-Debug

@@ -116,6 +116,12 @@ pipeline {
                                 LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
                             '''
                         }
+                        timeout(time: 5, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/blender
+                                make check
+                            '''
+                        }
                         sh '''
                            # Workaround LTP bug (see https://github.com/linux-test-project/ltp/issues/560 for upstream fix):
                            git -C LibOS/shim/test/apps/ltp/src checkout -- utils/ffsb-6.0-rc2/config.h.in utils/ffsb-6.0-rc2/configure
@@ -143,6 +149,7 @@ pipeline {
                            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 LibOS/shim/test/apps/blender distclean
                            make -C Pal/src PAL_HOST=Skeleton clean
 
                            ./Scripts/clean-check

+ 7 - 0
Jenkinsfiles/Linux-Debug-18.04

@@ -115,6 +115,12 @@ pipeline {
                                 LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
                             '''
                         }
+                        timeout(time: 5, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/blender
+                                make check
+                            '''
+                        }
                         sh '''
                            # Workaround LTP bug (see https://github.com/linux-test-project/ltp/issues/560 for upstream fix):
                            git -C LibOS/shim/test/apps/ltp/src checkout -- utils/ffsb-6.0-rc2/config.h.in utils/ffsb-6.0-rc2/configure
@@ -142,6 +148,7 @@ pipeline {
                            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 LibOS/shim/test/apps/blender distclean
 
                            ./Scripts/clean-check
                         '''

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

@@ -122,6 +122,13 @@ pipeline {
                                 LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
                             '''
                         }
+                        timeout(time: 5, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/blender
+                                make SGX=1
+                                make SGX=1 check
+                           '''
+                        }
                         sh '''
                            ./Scripts/gitignore-test
                         '''
@@ -141,6 +148,7 @@ pipeline {
                            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
+                           make -C LibOS/shim/test/apps/blender SGX=1 distclean
 
                            # Currently used release of LTP contains broken symlinks under
                            # utils/ffsb-6.0-rc2/ (config.guess and config.sub); without explicit

+ 8 - 0
Jenkinsfiles/Linux-SGX-apps

@@ -119,6 +119,13 @@ pipeline {
                                 LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh https://127.0.0.1:8443
                             '''
                         }
+                        timeout(time: 5, unit: 'MINUTES') {
+                            sh '''
+                                cd LibOS/shim/test/apps/blender
+                                make SGX=1
+                                make SGX=1 check
+                            '''
+                        }
                         sh '''
                            ./Scripts/gitignore-test
                         '''
@@ -138,6 +145,7 @@ pipeline {
                            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
+                           make -C LibOS/shim/test/apps/blender SGX=1 distclean
 
                            # Currently used release of LTP contains broken symlinks under
                            # utils/ffsb-6.0-rc2/ (config.guess and config.sub); without explicit

+ 5 - 0
Jenkinsfiles/ubuntu-16.04.dockerfile

@@ -18,12 +18,17 @@ RUN apt-get update \
        libexpat1 \
        libexpat1-dev \
        libnss-mdns \
+       libnuma1 \
        libomp-dev \
        libpcre2-dev \
        libpcre3-dev \
        libprotobuf-c-dev \
        libssl-dev \
+       libxfixes3 \
+       libxi6 \
        libxml2-dev \
+       libxrender1 \
+       libxxf86vm1 \
        linux-headers-4.4.0-161-generic \
        net-tools \
        protobuf-c-compiler \

+ 5 - 0
Jenkinsfiles/ubuntu-18.04.dockerfile

@@ -18,12 +18,17 @@ RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install -y \
     libexpat1 \
     libexpat1-dev \
     libnss-mdns \
+    libnuma1 \
     libomp-dev \
     libpcre2-dev \
     libpcre3-dev \
     libprotobuf-c-dev \
     libssl-dev \
+    libxfixes3 \
+    libxi6 \
     libxml2-dev \
+    libxrender1 \
+    libxxf86vm1 \
     linux-headers-4.15.0-20-generic \
     net-tools \
     protobuf-c-compiler \

+ 1 - 1
LibOS/shim/test/apps

@@ -1 +1 @@
-Subproject commit e03a9ea200587a24a6a6febf70913ebff243ebce
+Subproject commit aa2a35a11bf4e32aeddb31e7bf248bc186ba7aaa