clearlinux/graphene
2
0
Fork 0
mirror of https://github.com/clearlinux/graphene.git synced 2026-09-06 13:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CI] Refactor common stage-test

Browse Source 
Also remove central artifacts.jenkinsfile, which in hindsight was a bad,
if-ridden idea. The try/finally should be exactly around the sh block
which generates the junit file in question.
This commit is contained in:
Wojtek Porczyk
2020-12-02 22:45:07 +01:00
parent f3f8612d34
commit 865a9be1b9
13 changed files with 70 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ci/lib/artifacts.jenkinsfile
-4
View File
@@ -1,4 +0,0 @@
always {
junit 'Pal/regression/pal-regression.xml'
junit 'LibOS/shim/test/regression/libos-regression.xml'
}
.ci/lib/stage-test-all-nosgx.jenkinsfile → .ci/lib/stage-test-direct.jenkinsfile
+1 -16
View File
@@ -1,19 +1,4 @@
stage('test') {
sh '''
cd Pal/regression
make ${MAKEOPTS} all
make regression
'''
sh '''
cd LibOS/shim/test/regression
make ${MAKEOPTS} all
make regression
'''
sh '''
cd LibOS/shim/test/fs
make ${MAKEOPTS} all
make test
'''
stage('test-direct') {
try {
sh '''
cd LibOS/shim/test/ltp
.ci/lib/stage-test-apps-sgx.jenkinsfile → .ci/lib/stage-test-sgx.jenkinsfile
+1 -1
View File
@@ -1,4 +1,4 @@
stage('test') {
stage('test-sgx') {
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd Examples/python-simple
.ci/lib/stage-test-simple-sgx.jenkinsfile
-30
View File
@@ -1,30 +0,0 @@
stage('test') {
sh '''
make ${MAKEOPTS} test
make ${MAKEOPTS} sgx-tokens
make ${MAKEOPTS} -C Pal/src/host/Linux-SGX/tools install \
PREFIX=../../../../../../LibOS/shim/test/fs
'''
timeout(time: 15, unit: 'MINUTES') {
sh '''
cd Pal/regression
make -j8 SGX=1 all sgx-tokens
make SGX=1 KEEP_LOG=1 regression
'''
}
timeout(time: 15, unit: 'MINUTES') {
sh '''
cd LibOS/shim/test/regression
make clean SGX=1 # re-build with ra_client_spid set
make -j8 SGX=1 RA_CLIENT_SPID=${ra_client_spid} all sgx-tokens
make SGX=1 regression
'''
}
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd LibOS/shim/test/fs
make -j8 SGX=1 all sgx-tokens
make SGX=1 test
'''
}
}
.ci/lib/stage-test.jenkinsfile
+56
View File
@@ -0,0 +1,56 @@
stage('test') {
sh '''
make ${MAKEOPTS} test
if test -n "$SGX"
then
make ${MAKEOPTS} sgx-tokens
make ${MAKEOPTS} -C Pal/src/host/Linux-SGX/tools install \
PREFIX=../../../../../../LibOS/shim/test/fs
fi
'''
timeout(time: 15, unit: 'MINUTES') {
try {
sh '''
cd Pal/regression
make ${MAKEOPTS} all
if test -n "$SGX"
then
make ${MAKEOPTS} sgx-tokens
fi
make regression
'''
} finally {
junit 'Pal/regression/pal-regression.xml'
}
}
timeout(time: 15, unit: 'MINUTES') {
try {
sh '''
cd LibOS/shim/test/regression
make clean # re-build with ra_client_spid set
make ${MAKEOPTS} RA_CLIENT_SPID=${ra_client_spid} all
if test -n "$SGX"
then
make ${MAKEOPTS} RA_CLIENT_SPID=${ra_client_spid} sgx-tokens
fi
make regression
'''
} finally {
junit 'LibOS/shim/test/regression/libos-regression.xml'
}
}
timeout(time: 5, unit: 'MINUTES') {
sh '''
cd LibOS/shim/test/fs
make ${MAKEOPTS} all
if test -n "$SGX"
then
make ${MAKEOPTS} sgx-tokens
fi
make test
'''
}
}
.ci/linux-direct-ubuntu16.04-gcc-debug.jenkinsfile
+2 -5
View File
@@ -12,11 +12,8 @@ node('nonsgx_slave') {
load '.ci/lib/stage-lint.jenkinsfile'
load '.ci/lib/stage-clean-check-prepare.jenkinsfile'
load '.ci/lib/stage-build-nosgx.jenkinsfile'
try {
load '.ci/lib/stage-test-all-nosgx.jenkinsfile'
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-test.jenkinsfile'
load '.ci/lib/stage-test-direct.jenkinsfile'
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
.ci/linux-direct-ubuntu16.04-gcc-release.jenkinsfile
+2 -5
View File
@@ -12,11 +12,8 @@ node('nonsgx_slave') {
load '.ci/lib/stage-lint.jenkinsfile'
load '.ci/lib/stage-clean-check-prepare.jenkinsfile'
load '.ci/lib/stage-build-nosgx.jenkinsfile'
try {
load '.ci/lib/stage-test-all-nosgx.jenkinsfile'
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-test.jenkinsfile'
load '.ci/lib/stage-test-direct.jenkinsfile'
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
.ci/linux-direct-ubuntu18.04-gcc-debug.jenkinsfile
+2 -5
View File
@@ -12,11 +12,8 @@ node('nonsgx_slave') {
load '.ci/lib/stage-lint.jenkinsfile'
load '.ci/lib/stage-clean-check-prepare.jenkinsfile'
load '.ci/lib/stage-build-nosgx.jenkinsfile'
try {
load '.ci/lib/stage-test-all-nosgx.jenkinsfile'
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-test.jenkinsfile'
load '.ci/lib/stage-test-direct.jenkinsfile'
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
.ci/linux-direct-ubuntu18.04-gcc-release.jenkinsfile
+2 -5
View File
@@ -12,11 +12,8 @@ node('nonsgx_slave') {
load '.ci/lib/stage-lint.jenkinsfile'
load '.ci/lib/stage-clean-check-prepare.jenkinsfile'
load '.ci/lib/stage-build-nosgx.jenkinsfile'
try {
load '.ci/lib/stage-test-all-nosgx.jenkinsfile'
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-test.jenkinsfile'
load '.ci/lib/stage-test-direct.jenkinsfile'
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
.ci/linux-sgx-ubuntu16.04-gcc-release-apps.jenkinsfile
+1 -5
View File
@@ -13,11 +13,7 @@ node('sgx_slave_2.6') {
load '.ci/lib/stage-lint.jenkinsfile'
load '.ci/lib/stage-clean-check-prepare.jenkinsfile'
load '.ci/lib/stage-build-sgx.jenkinsfile'
try {
load '.ci/lib/stage-test-apps-sgx.jenkinsfile'
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-test-sgx.jenkinsfile'
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
.ci/linux-sgx-ubuntu16.04-gcc-release.jenkinsfile
+1 -5
View File
@@ -13,11 +13,7 @@ node('sgx_slave_2.6') {
load '.ci/lib/stage-lint.jenkinsfile'
load '.ci/lib/stage-clean-check-prepare.jenkinsfile'
load '.ci/lib/stage-build-sgx.jenkinsfile'
try {
load '.ci/lib/stage-test-simple-sgx.jenkinsfile'
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-test.jenkinsfile'
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
.ci/linux-sgx-ubuntu18.04-gcc-release-apps.jenkinsfile
+1 -5
View File
@@ -13,11 +13,7 @@ node('sgx_slave_2.6') {
load '.ci/lib/stage-lint.jenkinsfile'
load '.ci/lib/stage-clean-check-prepare.jenkinsfile'
load '.ci/lib/stage-build-sgx.jenkinsfile'
try {
load '.ci/lib/stage-test-apps-sgx.jenkinsfile'
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-test-sgx.jenkinsfile'
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
.ci/linux-sgx-ubuntu18.04-gcc-release.jenkinsfile
+1 -5
View File
@@ -13,11 +13,7 @@ node('sgx_slave_2.6') {
load '.ci/lib/stage-lint.jenkinsfile'
load '.ci/lib/stage-clean-check-prepare.jenkinsfile'
load '.ci/lib/stage-build-sgx.jenkinsfile'
try {
load '.ci/lib/stage-test-simple-sgx.jenkinsfile'
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-test.jenkinsfile'
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}