produce one xunitfile per py version and merge them

Author: oesteban

circle.yml

@@ -25,13 +25,14 @@ dependencies:
         timeout: 1600
     - mkdir -p ~/docker; docker save nipype/nipype_test:py35 > ~/docker/image.tar :
         timeout: 1600
+    - pip install xunitmerge
 
 test:
   override:
     - docker run -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /root/src/nipype/doc nipype/nipype_test:py35 /usr/bin/run_builddocs.sh
-    - docker run -v /etc/localtime:/etc/localtime:ro -e FSL_COURSE_DATA="/root/examples/nipype-fsl_course_data" -v ~/examples:/root/examples:ro -v ~/scratch:/scratch -w /root/src/nipype nipype/nipype_test:py35 /usr/bin/run_nosetests.sh :
+    - docker run -v /etc/localtime:/etc/localtime:ro -e FSL_COURSE_DATA="/root/examples/nipype-fsl_course_data" -v ~/examples:/root/examples:ro -v ~/scratch:/scratch -w /root/src/nipype nipype/nipype_test:py35 /usr/bin/run_nosetests.sh py35 :
         timeout: 2600
-    - docker run -v /etc/localtime:/etc/localtime:ro -e FSL_COURSE_DATA="/root/examples/nipype-fsl_course_data" -v ~/examples:/root/examples:ro -v ~/scratch:/scratch -w /root/src/nipype nipype/nipype_test:py27 /usr/bin/run_nosetests.sh :
+    - docker run -v /etc/localtime:/etc/localtime:ro -e FSL_COURSE_DATA="/root/examples/nipype-fsl_course_data" -v ~/examples:/root/examples:ro -v ~/scratch:/scratch -w /root/src/nipype nipype/nipype_test:py27 /usr/bin/run_nosetests.sh py27 :
         timeout: 2600
     - docker run -v /etc/localtime:/etc/localtime:ro -v ~/examples:/root/examples:ro -v ~/scratch:/scratch -w /scratch nipype/nipype_test:py35 /usr/bin/run_examples.sh test_spm Linear /root/examples/ workflow3d :
         timeout: 1600
@@ -46,14 +47,16 @@ test:
     - docker run -v /etc/localtime:/etc/localtime:ro -v ~/examples:/root/examples:ro -v ~/scratch:/scratch -w /scratch nipype/nipype_test:py27 /usr/bin/run_examples.sh fmri_spm_nested MultiProc /root/examples/ level1
     - docker run -v /etc/localtime:/etc/localtime:ro -v ~/examples:/root/examples:ro -v ~/scratch:/scratch -w /scratch nipype/nipype_test:py35 /usr/bin/run_examples.sh fmri_spm_nested MultiProc /root/examples/ level1
     - docker run -v /etc/localtime:/etc/localtime:ro -v ~/examples:/root/examples:ro -v ~/scratch:/scratch -w /scratch nipype/nipype_test:py35 /usr/bin/run_examples.sh fmri_spm_nested Linear /root/examples/ l2pipeline
-    
+
   post:
     - bash docker/circleci/teardown.sh
 
 general:
   artifacts:
     - "~/docs"
     - "~/logs"
-    - "~/coverage.xml"
-    - "~/nosetests.xml"
+    - "~/coverage_py27.xml"
+    - "~/coverage_py35.xml"
+    - "~/nosetests_py27.xml"
+    - "~/nosetests_py35.xml"
     - "~/scratch"

docker/circleci/run_nosetests.sh

@@ -4,19 +4,19 @@ set -x
 set -u
 
 # Create necessary directories
-mkdir -p /scratch/nose /scratch/crashfiles
+mkdir -p /scratch/nose /scratch/crashfiles /scratch/logs/$1
 
 # Create a nipype config file
 mkdir -p /root/.nipype
 echo '[logging]' > /root/.nipype/nipype.cfg
 echo 'log_to_file = true' >> /root/.nipype/nipype.cfg
-echo 'log_directory = /scratch/logs/' >> /root/.nipype/nipype.cfg
+echo "log_directory = /scratch/logs/$1" >> /root/.nipype/nipype.cfg
 
 
 # Run tests
 cd /root/src/nipype/
 make clean
-nosetests -s nipype -c /root/src/nipype/.noserc --xunit-file="/scratch/nosetests.xml" --cover-xml-file="/scratch/coverage.xml"
+nosetests -s nipype -c /root/src/nipype/.noserc --xunit-file="/scratch/nosetests_$1.xml" --cover-xml-file="/scratch/coverage_$1.xml"
 
 # Copy crashfiles to scratch
 for i in $(find /root/src/nipype/ -name "crash-*" ); do cp $i /scratch/crashfiles/; done

docker/circleci/teardown.sh

@@ -7,8 +7,8 @@ set -u
 set -e
 
 mkdir -p ${CIRCLE_TEST_REPORTS}/nose
-sudo cp ~/scratch/nosetests.xml ${CIRCLE_TEST_REPORTS}/nose/${CIRCLE_PROJECT_REPONAME}.xml
-sudo mv ~/scratch/coverage.xml ~/coverage.xml
+xunitmerge ~/scratch/nosetests*.xml ${CIRCLE_TEST_REPORTS}/nose/${CIRCLE_PROJECT_REPONAME}.xml
+sudo mv ~/scratch/coverage*.xml ~/
 mkdir -p ~/docs
 sudo mv ~/scratch/docs/* ~/docs/
 mkdir -p ~/logs