split codecov and test reports, keep crashfiles as artifacts

Author: oesteban

.circle/codecov.sh

@@ -18,7 +18,3 @@ find "${WORKDIR}/tests/" -name 'coverage*.xml' -maxdepth 1 -print0 | \
 find "${WORKDIR}/tests/" -name 'smoketest*.xml' -maxdepth 1 -print0 | \
   xargs -0 -I file ./codecov.io -f file -t "${CODECOV_TOKEN}" -F smoketests
 
-# Place test and coverage in the tests folder
-mkdir -p ${CIRCLE_TEST_REPORTS}/tests/
-cp ${WORKDIR}/tests/*.xml ${CIRCLE_TEST_REPORTS}/tests/
-

circle.yml

@@ -49,6 +49,8 @@ test:
         timeout: 7200
         parallel: true
   post:
+    # Place reports in the appropriate folder
+    - mkdir -p ${CIRCLE_TEST_REPORTS}/tests/ && cp ${WORKDIR}/tests/*.xml ${CIRCLE_TEST_REPORTS}/tests/
     # Send coverage data to codecov.io
     - bash .circle/codecov.sh
 
@@ -57,6 +59,7 @@ general:
     - "~/work/docs"
     - "~/work/logs"
     - "~/work/tests"
+    - "~/work/crashfiles"
 
 deployment:
   production:

docker/files/run_examples.sh

@@ -8,7 +8,7 @@ arr=$@
 tmp_var=$( IFS=$' '; echo "${arr[*]}" )
 example_id=${tmp_var//[^A-Za-z0-9_-]/_}
 
-mkdir -p ${HOME}/.nipype ${WORKDIR}/logs/example_${example_id} ${WORKDIR}/tests
+mkdir -p ${HOME}/.nipype ${WORKDIR}/logs/example_${example_id} ${WORKDIR}/tests ${WORKDIR}/crashfiles
 echo "[logging]" > ${HOME}/.nipype/nipype.cfg
 echo "workflow_level = DEBUG" >> ${HOME}/.nipype/nipype.cfg
 echo "interface_level = DEBUG" >> ${HOME}/.nipype/nipype.cfg
@@ -17,16 +17,16 @@ echo "log_to_file = true" >> ${HOME}/.nipype/nipype.cfg
 echo "log_directory = ${WORKDIR}/logs/example_${example_id}" >> ${HOME}/.nipype/nipype.cfg
 
 # Set up coverage
-export COVERAGE_FILE=${WORKDIR}/tests/.coverage_${example_id}
-#sed -i -E "s/(source = ).*'/\1\/src\/nipype\/nipype/" /src/nipype/.coveragerc
-
+export COVERAGE_FILE=${WORKDIR}/tests/.coverage.${example_id}
 if [ "$2" == "MultiProc" ]; then
 	echo "concurrency = multiprocessing" >> /src/nipype/.coveragerc
 fi
 
 coverage run /src/nipype/tools/run_examples.py $@
 exit_code=$?
 
+# Collect crashfiles and generate xml report
 coverage xml -o ${WORKDIR}/tests/smoketest_${example_id}.xml
+find /work -name "crash-*" -maxdepth 1 -exec mv {} ${WORKDIR}/crashfiles/ \;
 exit $exit_code
 

docker/files/run_pytests.sh

@@ -24,20 +24,20 @@ if [[ "${PYTHON_VERSION}" -lt "30" ]]; then
 fi
 
 # Run tests using pytest
-export COVERAGE_FILE=${WORKDIR}/tests/.coverage_py${PYTHON_VERSION}
+export COVERAGE_FILE=${WORKDIR}/tests/.coverage.py${PYTHON_VERSION}
 py.test -v --junitxml=${WORKDIR}/tests/pytests_py${PYTHON_VERSION}.xml --cov nipype --cov-config /src/nipype/.coveragerc --cov-report xml:${WORKDIR}/tests/coverage_py${PYTHON_VERSION}.xml ${TESTPATH}
 exit_code=$?
 
 # Workaround: run here the profiler tests in python 3
 if [[ "${PYTHON_VERSION}" -ge "30" ]]; then
     echo '[execution]' >> ${HOME}/.nipype/nipype.cfg
     echo 'profile_runtime = true' >> ${HOME}/.nipype/nipype.cfg
-    export COVERAGE_FILE=${WORKDIR}/tests/.coverage_py${PYTHON_VERSION}_extra
+    export COVERAGE_FILE=${WORKDIR}/tests/.coverage.py${PYTHON_VERSION}_extra
     py.test -v --junitxml=${WORKDIR}/tests/pytests_py${PYTHON_VERSION}_extra.xml --cov nipype --cov-report xml:${WORKDIR}/tests/coverage_py${PYTHON_VERSION}_extra.xml /src/nipype/nipype/interfaces/tests/test_runtime_profiler.py /src/nipype/nipype/pipeline/plugins/tests/test_multiproc*.py
     exit_code=$(( $exit_code + $? ))
 fi
 
-find /src/nipype/ -name "crash-*" -exec mv {} ${WORKDIR}/crashfiles/ \;
+find /work -name "crash-*" -maxdepth 1 -exec mv {} ${WORKDIR}/crashfiles/ \;
 
 # Just in case output xml files are misplaced,
 # then circle would not tell the tests failed otherwise