Tests/EndToEndTests/Examples/Image/MNIST/: fix bad merge

Original payload of the CR wasn't fully merged. This should fix this.
Additionally, added a stability fix to 02_Convolution.

Tests/EndToEndTests/Examples/Image/MNIST/01_OneHidden/run-test

@@ -4,10 +4,34 @@
 
 ConfigDir=$TEST_DIR/../../../../../../Examples/Image/MNIST/Config
 
-# TODO test for presence of data
+if [[ ! -d $TEST_DATA_DIR || ! -e $TEST_DATA_DIR/Test-28x28.txt || ! -e $TEST_DATA_DIR/Test-28x28.txt ]]; then
+    # Cannot find test data locally.
+    # Try external test data directory (not part of the CNTK repository) as an alternative.
+    if [[ -d "$CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY" ]]; then
+        if [ "$OS" == "Windows_NT" ]; then
+            DataSourceDir=`cygpath -au $CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY`/Image/MNIST/v0
+        else
+            DataSourceDir=$CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY/Image/MNIST/v0
+        fi
+
+        # Copy the test data to the test run directory
+        DataDir=$TEST_RUN_DIR/TestData
+        mkdir $DataDir
+        cp -R $DataSourceDir/* $DataDir || exit $?
+        Copied=1
+    else
+        echo Error: cannot find data. Please see Examples/Image/MNIST/README.md for instructions to get it.
+        exit 1
+    fi
+fi
 
-# cntkrun <CNTK config file name> <additional CNTK args>
 imageLayout=cudnn
 
-cntkrun 01_OneHidden.cntk  "MNISTtrain=[reader=[randomize=none]]  imageLayout=\"$imageLayout\"" || exit $?
+# Note: explicitly turn off randomization, as it crashes the reader.
+cntkrun  01_OneHidden.cntk  "train=[reader=[randomize=none]]  imageLayout=\"$imageLayout\""
+ExitCode=$?
+
+# Delete the test data if copied
+[[ "$Copied" -eq "1" ]] && rm -rf "$DataDir"
 
+exit $ExitCode

Tests/EndToEndTests/Examples/Image/MNIST/01_OneHidden/testcases.yml

@@ -1,8 +1,10 @@
 dataDir: ../../../../../../Examples/Image/MNIST/Data
 
 tags:
-    # TODO
-    - nightly-e (build_sku=='gpu') and ((device=='gpu') or (flavor=='release')) 
+    # In BVT, run Release GPU (~ 30 - 60 sec)
+    - bvt-e (build_sku=='gpu') and (device=='gpu') and (flavor=='release') 
+    # In Nightly on Linux, additionally run Debug GPU and Release CPU (~ 30 - 120 sec)
+    - nightly-e (build_sku=='gpu') and (((device=='gpu') and (flavor=='release')) or (os=='linux' and ((flavor=='debug') ^ (device=='cpu'))))
 
 testCases:
   CNTK Run must be completed: