Merge branch 'poq_issue_359' into devel

Author: poquirion

Dockerfile

@@ -55,8 +55,10 @@ ADD util/bin/niak_jupyter /usr/local/bin/niak_jupyter
 ADD util/lib/psom_gb_vars_local.jupyter /usr/local/lib/psom_gb_vars_local.jupyter
 ADD util/lib/jupyter_notebook_config.py /usr/local/lib/jupyter_notebook_config.py
 EXPOSE 8080
+
+
 # To run with jupyter
-# docker run -it --rm  -v /niak_sandbox:$PWD --user $UID -p 8080:6666 simexp/niak:beta niak_jupyter
+# docker run -it --rm  -v /niak_sandbox:$PWD --user $UID -p 8080:6666 simexp/niak-cog niak_jupyter
 
 
 # Command to run octave as GUI

circle.yml

@@ -9,16 +9,19 @@ machine:
 
 dependencies:
   cache_directories:
-    - "data_test_niak_mnc1"
-    - "~/docker"
+    - "~/cache"
   override:
-    - if [[ -e ~/docker/niak_u16_o4.tar ]]; then docker load -i ~/docker/niak_u16_o4.tar; fi
-    - docker pull simexp/niak_dependency:u16_o4
-    - mkdir -p ~/docker; docker save simexp/niak_dependency:u16_o4 > ~/docker/niak_u16_o4.tar
+    - if [[ -e ~/cache/niak_o4_cross_u16.tar ]]; then docker load -i ~/cache/niak_o4_cross_u16.tar; fi
+    - docker pull simexp/niak_dependency:o4_cross_u16
+    - mkdir -p ~/cache
+    - ls ~/cache
+    - docker save -o ~/cache/niak_o4_cross_u16.tar simexp/niak_dependency:o4_cross_u16
+    - if [[ -e ~/cache/data_test_niak_mnc1 ]]; then cp ~/cache/data_test_niak_mnc1 . ; fi
+    - find ~/cache -type f -not -name "*data_test_niak_mnc1*" -not -name "*niak_o4_cross_u16*" -exec rm {} \; # delete old cache crap!
 
 test:
   override:
-    - docker run -it -v $PWD:$PWD simexp/niak_dependency:u16_o4 /bin/bash -lic "cd $PWD; octave --eval \"addpath(genpath(pwd));[pipe,opt,status] = niak_test_all(struct(),struct('psom',struct('mode_pipeline_manager','session','mode','background','max_queued',6,'flag_pause',false))); exit(status)\"":
+    - docker run -it -v $PWD:$PWD simexp/niak_dependency:o4_cross_u16 /bin/bash -lic "cd $PWD; octave --eval \"addpath(genpath(pwd));[pipe,opt,status] = niak_test_all(struct(),struct('psom',struct('mode_pipeline_manager','session','mode','background','max_queued',6,'flag_pause',false))); exit(status)\"":
        timeout: 21600
 
 #deployment:

extensions/niak_test/niak_test_connectome_demoniak.m

@@ -107,8 +107,10 @@
     out_c = [path_test.result 'report_test_regression_connectome_demoniak.csv'];
     opt_c.base_source = opt_demo.folder_out;
     opt_c.base_target = path_test.reference;
-    opt_c.black_list_source = [opt_demo.folder_out 'logs' filesep];
-    opt_c.black_list_target = [path_test.reference 'logs' filesep];
+    opt_c.black_list_source{1} = [opt_demo.folder_out 'logs' filesep];
+    opt_c.black_list_target{1} = [path_test.reference 'logs' filesep];
+    opt_c.black_list_source{2} = [opt_demo.folder_out 'pipe_parameters.mat' ];
+     opt_c.black_list_target{2} = [path_test.reference 'pipe_parameters.mat' ];
     pipeline = psom_add_job(pipeline,'test_connectome','niak_test_cmp_files',in_c,out_c,opt_c,false);
     pipeline.test_connectome.dep = list_jobs;
 end