graffy
/
lipase
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

fixes to continuous integration 

1. I forgot to specify fiji and raw data locations in jenkinsfile
2. the absence of fiji wasn't detected by the test
This commit is contained in:
Guillaume Raffy 2019-10-04 11:47:34 +02:00
parent 34fc0aca26
commit ad07463c64
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -7,7 +7,7 @@ pipeline {
// erase old builds if anything is left // erase old builds if anything is left
sh './scripts/cleanup.bash' sh './scripts/cleanup.bash'
sh './scripts/install_fiji.bash' sh './scripts/install_fiji.bash'
sh 'make install' sh 'make FIJI_ROOT_PATH=$(pwd)/Fiji.app install'
// sh 'export FIJI_ROOT_PATH=$(pwd)/Fiji.app; ./scripts/install_ij_opencv.bash' // sh 'export FIJI_ROOT_PATH=$(pwd)/Fiji.app; ./scripts/install_ij_opencv.bash'
// 'export FIJI_ROOT_PATH=$(pwd)/Fiji.app; ./scripts/install_lipase_in_fiji.bash' // 'export FIJI_ROOT_PATH=$(pwd)/Fiji.app; ./scripts/install_lipase_in_fiji.bash'
// echo 'Create or update the virtual Python environment' // echo 'Create or update the virtual Python environment'
@ -16,7 +16,7 @@ pipeline {
} }
stage('Testing the package...') { stage('Testing the package...') {
steps { steps {
sh 'make test' sh 'make FIJI_ROOT_PATH=$(pwd)/Fiji.app RAW_IMAGES_ROOT_PATH=/opt/ipr/cluster/work.global/graffy/jenkins-store/lipase/raw-images test'
} }
} }
// stage('Building HTML documentation...') { // stage('Building HTML documentation...') {

3
Makefile
View File

@ -30,7 +30,8 @@ install: install_lipase_libs install_lipase_plugins
test0001: install test0001: install
# on macosx : /Applications/Fiji.app/Contents/MacOS/ImageJ-macosx --ij2 --headless --run './test0001.py' # on macosx : /Applications/Fiji.app/Contents/MacOS/ImageJ-macosx --ij2 --headless --run './test0001.py'
# /Applications/Fiji.app/Contents/MacOS/ImageJ-macosx --ij2 --headless --run './tests/test0001.py' "lipase_src_root_path='$(pwd)',raw_images_root_path='/Users/graffy/ownCloud/ipr/lipase/raw-images'" # /Applications/Fiji.app/Contents/MacOS/ImageJ-macosx --ij2 --headless --run './tests/test0001.py' "lipase_src_root_path='$(pwd)',raw_images_root_path='/Users/graffy/ownCloud/ipr/lipase/raw-images'"
$(FIJI_EXE_PATH) --ij2 --headless --run './tests/test0001.py' "raw_images_root_path='$(RAW_IMAGES_ROOT_PATH)'" ; \ echo 2 > '/tmp/test_result.txt' ; \
$(FIJI_EXE_PATH) --ij2 --headless --run './tests/test0001.py' "raw_images_root_path='$(RAW_IMAGES_ROOT_PATH)'" ; \
ERROR_CODE=$$? ; \ ERROR_CODE=$$? ; \
echo "Fiji 's return code : $$ERROR_CODE" ; \ echo "Fiji 's return code : $$ERROR_CODE" ; \
ERROR_CODE=$$(cat '/tmp/test_result.txt') ; \ ERROR_CODE=$$(cat '/tmp/test_result.txt') ; \