Ver código fonte

[LibOS, Jenkins] parse LTP test results

Wojtek Porczyk 4 anos atrás
pai
commit
6866bdb2c6

+ 4 - 1
Jenkinsfiles/Linux

@@ -33,7 +33,7 @@ pipeline {
                         sh '''
                             cd LibOS/shim/test/apps/ltp
                             make
-                            ./syscalls.sh
+                            make ltp.xml
                             '''
                         timeout(time: 5, unit: 'MINUTES') {
                             sh '''
@@ -98,8 +98,11 @@ pipeline {
                     }
                     post {
                         always {
+                            archiveArtifacts 'LibOS/shim/test/apps/ltp/ltp.xml'
+
                             junit 'Pal/regression/pal-regression.xml'
                             junit 'LibOS/shim/test/regression/libos-regression.xml'
+                            junit 'LibOS/shim/test/apps/ltp/ltp.xml'
                         }
                     }
                 }

+ 4 - 1
Jenkinsfiles/Linux-18.04

@@ -27,7 +27,7 @@ pipeline {
                         sh '''
                             cd LibOS/shim/test/apps/ltp
                             make
-                            ./syscalls.sh
+                            make ltp.xml
                             '''
                         timeout(time: 5, unit: 'MINUTES') {
                             sh '''
@@ -68,8 +68,11 @@ pipeline {
                     }
                     post {
                         always {
+                            archiveArtifacts 'LibOS/shim/test/apps/ltp/ltp.xml'
+
                             junit 'Pal/regression/pal-regression.xml'
                             junit 'LibOS/shim/test/regression/libos-regression.xml'
+                            junit 'LibOS/shim/test/apps/ltp/ltp.xml'
                         }
                     }
                 }

+ 4 - 1
Jenkinsfiles/Linux-Debug

@@ -29,7 +29,7 @@ pipeline {
                         sh '''
                             cd LibOS/shim/test/apps/ltp
                             make
-                            ./syscalls.sh
+                            make ltp.xml
                             '''
                         timeout(time: 5, unit: 'MINUTES') {
                             sh '''
@@ -92,8 +92,11 @@ pipeline {
                     }
                     post {
                         always {
+                            archiveArtifacts 'LibOS/shim/test/apps/ltp/ltp.xml'
+
                             junit 'Pal/regression/pal-regression.xml'
                             junit 'LibOS/shim/test/regression/libos-regression.xml'
+                            junit 'LibOS/shim/test/apps/ltp/ltp.xml'
                         }
                     }
                 }

+ 4 - 1
Jenkinsfiles/Linux-Debug-18.04

@@ -24,7 +24,7 @@ pipeline {
                         sh '''
                             cd LibOS/shim/test/apps/ltp
                             make
-                            ./syscalls.sh
+                            make ltp.xml
                             '''
                         timeout(time: 5, unit: 'MINUTES') {
                             sh '''
@@ -65,8 +65,11 @@ pipeline {
                     }
                     post {
                         always {
+                            archiveArtifacts 'LibOS/shim/test/apps/ltp/ltp.xml'
+
                             junit 'Pal/regression/pal-regression.xml'
                             junit 'LibOS/shim/test/regression/libos-regression.xml'
+                            junit 'LibOS/shim/test/apps/ltp/ltp.xml'
                         }
                     }
                 }

+ 13 - 7
Jenkinsfiles/Linux-SGX

@@ -57,6 +57,11 @@ pipeline {
                                 make SGX=1 regression
                             '''
                         }
+                        sh '''
+                            cd LibOS/shim/test/apps/ltp
+                            make SGX=1 all sgx-tokens
+                            make SGX=1 ltp-sgx.xml
+                            '''
                         timeout(time: 5, unit: 'MINUTES') {
                             sh '''
                                 cd LibOS/shim/test/apps/python
@@ -107,6 +112,11 @@ pipeline {
                            make SGX=1 clean
                            rm LibOS/glibc-*.tar.gz
                            make -C LibOS/shim/test/regression SGX=1 clean
+                           make -C LibOS/shim/test/apps/ltp clean
+                           # LTP's make clean is broken, see https://github.com/linux-test-project/ltp/issues/559
+                           rm -rf /tmp/graphene-sgx.clean-check.clean/LibOS/shim/test/apps/ltp/src
+                           rm -rf LibOS/shim/test/apps/ltp/src
+
                            make -C LibOS/shim/test/apps/python SGX=1 clean
                            make -C LibOS/shim/test/apps/bash SGX=1 clean
                            make -C LibOS/shim/test/apps/gcc SGX=1 clean
@@ -114,20 +124,16 @@ pipeline {
                            make -C LibOS/shim/test/apps/lighttpd SGX=1 distclean
                            make -C LibOS/shim/test/apps/apache SGX=1 distclean
 
-                           # LTP contains dead symlinks, which confuses the
-                           # clean-check script. Just delete them.
-                           for d in . /tmp/graphene-sgx.clean-check.clean; do
-                               rm $d/LibOS/shim/test/apps/ltp/src/utils/ffsb-6.0-rc2/config.sub
-                               rm $d/LibOS/shim/test/apps/ltp/src/utils/ffsb-6.0-rc2/config.guess
-                           done
-
                            ./Scripts/clean-check
                         '''
                     }
                     post {
                         always {
+                            archiveArtifacts 'LibOS/shim/test/apps/ltp/ltp-sgx.xml'
+
                             junit 'Pal/regression/pal-regression.xml'
                             junit 'LibOS/shim/test/regression/libos-regression.xml'
+                            junit 'LibOS/shim/test/apps/ltp/ltp-sgx.xml'
                         }
                     }
                 }

+ 8 - 0
Jenkinsfiles/Linux-SGX-18.04

@@ -54,6 +54,11 @@ pipeline {
                                 make SGX=1 regression
                             '''
                         }
+                        sh '''
+                            cd LibOS/shim/test/apps/ltp
+                            make
+                            make ltp-sgx.xml
+                            '''
                         timeout(time: 5, unit: 'MINUTES') {
                             sh '''
                                 cd LibOS/shim/test/apps/python
@@ -101,8 +106,11 @@ pipeline {
                     }
                     post {
                         always {
+                            archiveArtifacts 'LibOS/shim/test/apps/ltp/ltp-sgx.xml'
+
                             junit 'Pal/regression/pal-regression.xml'
                             junit 'LibOS/shim/test/regression/libos-regression.xml'
+                            junit 'LibOS/shim/test/apps/ltp/ltp-sgx.xml'
                         }
                     }
                 }

+ 1 - 0
Jenkinsfiles/ubuntu-16.04.dockerfile

@@ -27,6 +27,7 @@ RUN apt-get update \
        protobuf-c-compiler \
        python \
        python3-minimal \
+       python3-lxml \
        python3-pip \
        python3-pytest \
        texinfo \

+ 1 - 0
Jenkinsfiles/ubuntu-18.04.dockerfile

@@ -30,6 +30,7 @@ RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install -y \
     python3-pip \
     python3-protobuf \
     python3-pytest \
+    python3-lxml \
     texinfo \
     wget
 

+ 1 - 1
LibOS/shim/test/apps

@@ -1 +1 @@
-Subproject commit 48c8fef8b60d9a1f732c6819f03d4764abc77365
+Subproject commit 1e17899d6ec6090dd210b1dfeb49c659eab03591