From a3305ed6b8db375de36e36dccbb4db3729db8551 Mon Sep 17 00:00:00 2001 From: borysp Date: Thu, 27 Feb 2020 15:24:17 +0100 Subject: [PATCH] [Jenkins] Add blender app to Jenkins --- Jenkinsfiles/Linux | 7 +++++++ Jenkinsfiles/Linux-18.04 | 7 +++++++ Jenkinsfiles/Linux-Debug | 7 +++++++ Jenkinsfiles/Linux-Debug-18.04 | 7 +++++++ Jenkinsfiles/Linux-SGX-18.04-apps | 8 ++++++++ Jenkinsfiles/Linux-SGX-apps | 8 ++++++++ Jenkinsfiles/ubuntu-16.04.dockerfile | 5 +++++ Jenkinsfiles/ubuntu-18.04.dockerfile | 5 +++++ LibOS/shim/test/apps | 2 +- 9 files changed, 55 insertions(+), 1 deletion(-) diff --git a/Jenkinsfiles/Linux b/Jenkinsfiles/Linux index 39731c00..878e85a5 100644 --- a/Jenkinsfiles/Linux +++ b/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 diff --git a/Jenkinsfiles/Linux-18.04 b/Jenkinsfiles/Linux-18.04 index 153f42e6..86cc5660 100644 --- a/Jenkinsfiles/Linux-18.04 +++ b/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 ''' diff --git a/Jenkinsfiles/Linux-Debug b/Jenkinsfiles/Linux-Debug index 6b6e7a2b..866c6a8d 100644 --- a/Jenkinsfiles/Linux-Debug +++ b/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 diff --git a/Jenkinsfiles/Linux-Debug-18.04 b/Jenkinsfiles/Linux-Debug-18.04 index 2f0e4cf1..5c84f881 100644 --- a/Jenkinsfiles/Linux-Debug-18.04 +++ b/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 ''' diff --git a/Jenkinsfiles/Linux-SGX-18.04-apps b/Jenkinsfiles/Linux-SGX-18.04-apps index bce6eef9..384584f7 100644 --- a/Jenkinsfiles/Linux-SGX-18.04-apps +++ b/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 diff --git a/Jenkinsfiles/Linux-SGX-apps b/Jenkinsfiles/Linux-SGX-apps index a23c148d..6d875de1 100644 --- a/Jenkinsfiles/Linux-SGX-apps +++ b/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 diff --git a/Jenkinsfiles/ubuntu-16.04.dockerfile b/Jenkinsfiles/ubuntu-16.04.dockerfile index 67b3cc32..b5448976 100644 --- a/Jenkinsfiles/ubuntu-16.04.dockerfile +++ b/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 \ diff --git a/Jenkinsfiles/ubuntu-18.04.dockerfile b/Jenkinsfiles/ubuntu-18.04.dockerfile index d4a390ae..e906114c 100644 --- a/Jenkinsfiles/ubuntu-18.04.dockerfile +++ b/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 \ diff --git a/LibOS/shim/test/apps b/LibOS/shim/test/apps index e03a9ea2..aa2a35a1 160000 --- a/LibOS/shim/test/apps +++ b/LibOS/shim/test/apps @@ -1 +1 @@ -Subproject commit e03a9ea200587a24a6a6febf70913ebff243ebce +Subproject commit aa2a35a11bf4e32aeddb31e7bf248bc186ba7aaa