[CI] Refactor clean-check into common jenkinsfile

This commit is contained in:
Wojtek Porczyk
2020-11-27 16:55:06 +01:00
committed by Wojtek Porczyk
parent 860441bfb4
commit 118a9e4451
14 changed files with 54 additions and 83 deletions
+44
View File
@@ -0,0 +1,44 @@
stage('clean-check') {
sh '''
./Scripts/gitignore-test
'''
sh '''
cd "$(./Scripts/clean-check-test-copy)"
rm -f Pal/src/host/Linux-SGX/signer/enclave-key.pem
make distclean
rm -rf LibOS/glibc-2.*
make -C LibOS/shim/test/regression clean
make -C Examples/python-simple clean
make -C Examples/python-scipy-insecure clean
make -C Examples/bash clean
make -C Examples/curl clean
#make -C Examples/gcc distclean
make -C Examples/memcached distclean
make -C Examples/redis distclean
make -C Examples/lighttpd distclean
make -C Examples/nginx distclean
make -C Examples/apache distclean
make -C Examples/blender distclean
#make -C Examples/r distclean
make -C Pal/src PAL_HOST=Skeleton clean
make -C Examples/ra-tls-mbedtls distclean
make -C Examples/ra-tls-secret-prov distclean
make -C LibOS/shim/test/ltp clean
# LTP's make clean is broken, see https://github.com/linux-test-project/ltp/issues/559
rm -rf /tmp/*.clean-check.clean/LibOS/shim/test/ltp/src
rm -rf LibOS/shim/test/ltp/src
# python/ subdir does not have makefiles, so no clean
rm -rf /tmp/*.clean-check.clean/python/graphenelibos/__pycache__
rm -rf python/graphenelibos/__pycache__
./Scripts/clean-check
'''
}
-32
View File
@@ -126,36 +126,4 @@ stage('test') {
'''
}
*/
sh '''
./Scripts/gitignore-test
'''
sh '''
cd "$(./Scripts/clean-check-test-copy)"
make distclean
rm -rf LibOS/glibc-2.*
make -C LibOS/shim/test/regression clean
make -C LibOS/shim/test/ltp clean
# LTP's make clean is broken, see https://github.com/linux-test-project/ltp/issues/559
rm -rf /tmp/graphene*.clean-check.clean/LibOS/shim/test/ltp/src
rm -rf LibOS/shim/test/ltp/src
make -C Examples/python-simple clean
make -C Examples/python-scipy-insecure clean
make -C Examples/bash clean
make -C Examples/curl clean
#make -C Examples/gcc distclean
make -C Examples/memcached distclean
make -C Examples/redis distclean
make -C Examples/lighttpd distclean
make -C Examples/nginx distclean
make -C Examples/apache distclean
make -C Examples/blender distclean
#make -C Examples/r distclean
make -C Pal/src PAL_HOST=Skeleton clean
./Scripts/clean-check
'''
}
-34
View File
@@ -149,38 +149,4 @@ stage('test') {
fi
'''
}
sh '''
./Scripts/gitignore-test
'''
sh '''
cd "$(./Scripts/clean-check-test-copy)"
rm Pal/src/host/Linux-SGX/signer/enclave-key.pem
make distclean
make -C Examples/python-simple SGX=1 clean
make -C Examples/python-scipy-insecure SGX=1 clean
make -C Examples/bash SGX=1 clean
make -C Examples/curl SGX=1 clean
#make -C Examples/gcc SGX=1 distclean
make -C Examples/memcached SGX=1 distclean
make -C Examples/redis SGX=1 distclean
make -C Examples/lighttpd SGX=1 distclean
make -C Examples/nginx SGX=1 distclean
make -C Examples/apache SGX=1 distclean
make -C Examples/blender SGX=1 distclean
#make -C Examples/r SGX=1 distclean
make -C Examples/ra-tls-mbedtls SGX=1 distclean
make -C Examples/ra-tls-secret-prov SGX=1 distclean
# Currently used release of LTP contains broken symlinks under
# utils/ffsb-6.0-rc2/ (config.guess and config.sub); without explicit
# rm of these symlinks, the clean-check utility fails. We should
# update to newer release of LTP where this issue will be fixed.
rm -rf /tmp/*/LibOS/shim/test/ltp/src
rm -rf LibOS/shim/test/ltp/src
./Scripts/clean-check
'''
}
-17
View File
@@ -34,21 +34,4 @@ stage('test') {
make -j8 SGX=1 all sgx-tokens
make SGX=1 ltp-sgx.xml || :
'''
sh '''
./Scripts/gitignore-test
'''
sh '''
cd "$(./Scripts/clean-check-test-copy)"
rm Pal/src/host/Linux-SGX/signer/enclave-key.pem
make distclean
make -C LibOS/shim/test/regression clean
make -C LibOS/shim/test/ltp clean
# LTP's make clean is broken, see https://github.com/linux-test-project/ltp/issues/559
rm -rf /tmp/graphene*.clean-check.clean/LibOS/shim/test/ltp/src
rm -rf LibOS/shim/test/ltp/src
./Scripts/clean-check
'''
}
@@ -19,5 +19,6 @@ node('nonsgx_slave') {
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
@@ -15,5 +15,6 @@ node('nonsgx_slave') {
load '.ci/lib/stage-lint.jenkinsfile'
load '.ci/lib/stage-clean-check-prepare.jenkinsfile'
load '.ci/lib/stage-build-nosgx.jenkinsfile'
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
@@ -19,5 +19,6 @@ node('nonsgx_slave') {
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
@@ -19,5 +19,6 @@ node('nonsgx_slave') {
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
@@ -15,5 +15,6 @@ node('nonsgx_slave') {
load '.ci/lib/stage-lint.jenkinsfile'
load '.ci/lib/stage-clean-check-prepare.jenkinsfile'
load '.ci/lib/stage-build-nosgx.jenkinsfile'
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
@@ -19,5 +19,6 @@ node('nonsgx_slave') {
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
@@ -20,5 +20,6 @@ node('sgx_slave_2.6') {
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
@@ -20,5 +20,6 @@ node('sgx_slave_2.6') {
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
@@ -20,5 +20,6 @@ node('sgx_slave_2.6') {
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}
@@ -20,5 +20,6 @@ node('sgx_slave_2.6') {
} finally {
load '.ci/lib/artifacts.jenkinsfile'
}
load '.ci/lib/stage-clean-check.jenkinsfile'
}
}