Merge pull request #6082 from slefrancois/jenkins_pipeline_buildbot

.jenkins/jenkins_buildbot_python2.sh

@@ -87,7 +87,7 @@ FLAGS=${FLAGS},magma.enabled=true
 FLAGS=${FLAGS},cmodule.age_thresh_use=604800
 
 echo "Executing tests with mode=FAST_RUN"
-NAME=fastrun
+NAME=python2_fastrun
 FILE=${ROOT_CWD}/theano_${NAME}_tests.xml
 echo "THEANO_FLAGS=cmodule.warn_no_version=True,${FLAGS},mode=FAST_RUN ${NOSETESTS} ${PROFILING} ${THEANO_PARAM} ${XUNIT}${FILE} ${SUITE}${NAME}"
 date
@@ -97,7 +97,7 @@ ls ${COMPILEDIR}|wc -l
 echo
 
 echo "Executing tests with mode=FAST_RUN,floatX=float32"
-NAME=fastrun_float32
+NAME=python2_fastrun_float32
 FILE=${ROOT_CWD}/theano_${NAME}_tests.xml
 echo "THEANO_FLAGS=${FLAGS},mode=FAST_RUN,floatX=float32 ${NOSETESTS} ${THEANO_PARAM} ${XUNIT}${FILE} ${SUITE}${NAME}"
 date
@@ -107,7 +107,7 @@ ls ${COMPILEDIR}|wc -l
 echo
 
 echo "Executing tests with linker=vm,vm.lazy=True,floatX=float32"
-NAME=fastrun_float32_lazyvm
+NAME=python2_fastrun_float32_lazyvm
 FILE=${ROOT_CWD}/theano_${NAME}_tests.xml
 echo "THEANO_FLAGS=${FLAGS},linker=vm,vm.lazy=True,floatX=float32 ${NOSETESTS} ${THEANO_PARAM} ${XUNIT}${FILE} ${SUITE}${NAME}"
 date
@@ -121,7 +121,7 @@ echo
 # with --batch=1000" # The buildbot freeze sometimes when collecting the tests to run
 # force_device=True as it would be useless to test the gpuarray back-end.
 echo "Executing tests with mode=FAST_COMPILE"
-NAME=fastcompile
+NAME=python2_fastcompile
 FILE=${ROOT_CWD}/theano_${NAME}_tests.xml
 echo "THEANO_FLAGS=${FLAGS},mode=FAST_COMPILE,force_device=True ${NOSETESTS} ${THEANO_PARAM} ${XUNIT}${FILE} ${SUITE}${NAME}"
 date

.jenkins/jenkins_buildbot_python2_32bit.sh

@@ -4,6 +4,7 @@ BUILDBOT_DIR=$WORKSPACE/nightly_build
 THEANO_PARAM="theano --with-timer --timer-top-n 10"
 # Set test reports using nosetests xunit
 XUNIT="--with-xunit --xunit-file="
+SUITE="--xunit-testsuite-name="
 
 mkdir -p ${BUILDBOT_DIR}
 ls -l ${BUILDBOT_DIR}
@@ -13,4 +14,5 @@ echo
 
 FILE=${BUILDBOT_DIR}/theano_python32bit_tests.xml
 set -x
-THEANO_FLAGS=device=cpu,force_device=true,lib.amdlibm=False,compiledir=$HOME/.theano/buildbot_theano_python2_32bit python bin/theano-nose ${THEANO_PARAM} ${XUNIT}${FILE}
+NAME=python2_32bit
+THEANO_FLAGS=device=cpu,force_device=true,lib.amdlibm=False,compiledir=$HOME/.theano/buildbot_theano_python2_32bit python bin/theano-nose ${THEANO_PARAM} ${XUNIT}${FILE}  ${SUITE}${NAME}
\ No newline at end of file

.jenkins/jenkins_buildbot_python2_debug.sh

@@ -46,6 +46,7 @@ python -c 'import pygpu; print(pygpu.__file__)'
 
 # nosetests xunit for test profiling
 XUNIT="--with-xunit --xunit-file="
+SUITE="--xunit-testsuite-name="
 
 mkdir -p ${BUILDBOT_DIR}
 ls -l ${BUILDBOT_DIR}
@@ -89,7 +90,8 @@ echo "Executing tests with mode=DEBUG_MODE with seed of the day $seed"
 FILE=${ROOT_CWD}/theano_debug_tests.xml
 echo "THEANO_FLAGS=${FLAGS},unittests.rseed=$seed,mode=DEBUG_MODE,DebugMode.check_strides=0,DebugMode.patience=3,DebugMode.check_preallocated_output= ${NOSETESTS} ${THEANO_PARAM} ${XUNIT}${FILE}"
 date
-THEANO_FLAGS=${FLAGS},unittests.rseed=$seed,mode=DEBUG_MODE,DebugMode.check_strides=0,DebugMode.patience=3,DebugMode.check_preallocated_output= ${NOSETESTS} ${THEANO_PARAM} ${XUNIT}${FILE}
+NAME=python2_debug
+THEANO_FLAGS=${FLAGS},unittests.rseed=$seed,mode=DEBUG_MODE,DebugMode.check_strides=0,DebugMode.patience=3,DebugMode.check_preallocated_output= ${NOSETESTS} ${THEANO_PARAM} ${XUNIT}${FILE} ${SUITE}${NAME}
 
 echo "Number of elements in the compiledir:"
 ls ${COMPILEDIR}|wc -l

.jenkins/jenkins_buildbot_python3.sh

@@ -60,10 +60,10 @@ set -x
 
 # Fast compile and float64
 FILE=${BUILDBOT_DIR}/theano_python3_fastcompile_f64_tests.xml
-NAME=fastcompile_f64
+NAME=python3_fastcompile_f64
 THEANO_FLAGS=$THEANO_FLAGS,compiledir=$COMPILEDIR,mode=FAST_COMPILE,warn.ignore_bug_before=all,on_opt_error=raise,on_shape_error=raise,magma.enabled=true,floatX=float64 python3 bin/theano-nose ${THEANO_PARAM} ${XUNIT}${FILE} ${SUITE}${NAME}
 
 # Fast run and float32
 FILE=${BUILDBOT_DIR}/theano_python3_fastrun_f32_tests.xml
-NAME=fastrun_f32
+NAME=python3_fastrun_f32
 THEANO_FLAGS=$THEANO_FLAGS,compiledir=$COMPILEDIR,mode=FAST_RUN,warn.ignore_bug_before=all,on_opt_error=raise,on_shape_error=raise,magma.enabled=true,floatX=float32 python3 bin/theano-nose ${THEANO_PARAM} ${XUNIT}${FILE} ${SUITE}${NAME}
\ No newline at end of file