From 2cf56639edbfbb4a89b738ae0798bb34e6af5992 Mon Sep 17 00:00:00 2001
From: jignparm <jignparm@microsoft.com>
Date: Tue, 28 May 2019 03:01:10 -0700
Subject: [PATCH] Minor update to NuGet package tests -- allow model download
 in separate step (#1115)

* Update docker scripts to not fetch model data

* Update related files
---
 .../runtest-docker-gpu.sh                     |  2 +-
 .../runtest-docker.sh                         |  3 +--
 .../runtest-gpu.sh                            | 19 ++++++++++---------
 .../runtest.sh                                | 17 +++++++++--------
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker-gpu.sh b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker-gpu.sh
index f08e027f89..ab50111bcc 100755
--- a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker-gpu.sh
+++ b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker-gpu.sh
@@ -39,7 +39,7 @@ docker run -h $HOSTNAME \
         -e "IsReleaseBuild=$IsReleaseBuild" \
         "onnxruntime-$IMAGE" \
         /bin/bash /onnxruntime_src/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-gpu.sh \
-        /home/onnxruntimedev/$NUGET_REPO_DIRNAME /onnxruntime_src /home/onnxruntimedev $TestDataUrl $TestDataChecksum &
+        /home/onnxruntimedev/$NUGET_REPO_DIRNAME /onnxruntime_src /home/onnxruntimedev &
 
 wait -n
 
diff --git a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker.sh b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker.sh
index f7bb480674..63ec87585b 100755
--- a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker.sh
+++ b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker.sh
@@ -4,7 +4,6 @@
 
 # build docker image for CPU
 
-#TODO: Get this working, not tested yet
 set -x
 
 SOURCE_ROOT=$1
@@ -44,7 +43,7 @@ docker run -h $HOSTNAME \
         -e "RunTestNative=$RunTestNative" \
         "onnxruntime-$IMAGE" \
         /bin/bash /onnxruntime_src/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest.sh \
-        /home/onnxruntimedev/$NUGET_REPO_DIRNAME /onnxruntime_src /home/onnxruntimedev $TestDataUrl $TestDataChecksum &
+        /home/onnxruntimedev/$NUGET_REPO_DIRNAME /onnxruntime_src /home/onnxruntimedev &
 
 wait -n
 
diff --git a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-gpu.sh b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-gpu.sh
index 127630cc85..9fc2f9b34e 100644
--- a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-gpu.sh
+++ b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-gpu.sh
@@ -5,18 +5,19 @@
 LocalNuGetRepo=$1
 SourceRoot=$2
 BuildDir=$3
-TestDataUrl=$4
-TestDataChecksum=$5
+#TestDataUrl=$4
+#TestDataChecksum=$5
 
 #TestDataUrl and TestDataChecksum comes from the build env variable
-set -x
 
-echo "Downloading test data"
-python3 $SourceRoot/tools/ci_build/build.py --update --download_test_data --build_dir $BuildDir --test_data_url $TestDataUrl --test_data_checksum $TestDataChecksum
-if [ $? -ne 0 ]; then
-    echo "Failed to download test data"
-    exit 1
-fi
+#echo "Downloading test data"
+#python3 $SourceRoot/tools/ci_build/build.py --update --download_test_data --build_dir $BuildDir --test_data_url $TestDataUrl --test_data_checksum $TestDataChecksum
+#if [ $? -ne 0 ]; then
+#    echo "Failed to download test data"
+#    exit 1
+#fi
+
+set -x
 
 OldDir=`pwd`
 cd $SourceRoot
diff --git a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest.sh b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest.sh
index 62001ae297..6b209a166f 100755
--- a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest.sh
+++ b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest.sh
@@ -5,17 +5,18 @@
 LocalNuGetRepo=$1
 SourceRoot=$2
 BuildDir=$3
-TestDataUrl=$4
-TestDataChecksum=$5
+#TestDataUrl=$4
+#TestDataChecksum=$5
 
 #TestDataUrl and TestDataChecksum comes from the build env variable
 
-echo "Downloading test data"
-python3 $SourceRoot/tools/ci_build/build.py --update --download_test_data --build_dir $BuildDir --test_data_url $TestDataUrl --test_data_checksum $TestDataChecksum
-if [ $? -ne 0 ]; then
-    echo "Failed to download test data"
-    exit 1
-fi
+#echo "Downloading test data"
+#python3 $SourceRoot/tools/ci_build/build.py --update --download_test_data --build_dir $BuildDir --test_data_url $TestDataUrl --test_data_checksum $TestDataChecksum
+#if [ $? -ne 0 ]; then
+#    echo "Failed to download test data"
+#    exit 1
+#fi
+set -x
 
 OldDir=`pwd`
 cd $SourceRoot