From 84a3152caba376f87b3b6c65c60c499f6f87b065 Mon Sep 17 00:00:00 2001
From: Rahul Huilgol <huilgolr@amazon.com>
Date: Mon, 28 Aug 2017 15:04:42 -0700
Subject: [PATCH 1/2] parallelize python windows tests

---
 Jenkinsfile | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ac34e71a53f1..c54d16792d33 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -342,7 +342,7 @@ try {
           }
         }
       },
-      'Python2/3: CPU Win':{
+      'Python 2: CPU Win':{
         node('mxnetwindows') {
           ws('workspace/ut-python-cpu') {
             init_git_win()
@@ -351,20 +351,30 @@ try {
     7z x -y vc14_cpu.7z'''
             bat """xcopy C:\\mxnet\\data data /E /I /Y
     xcopy C:\\mxnet\\model model /E /I /Y
-    call activate py3
+    call activate py2
     set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_cpu\\python
     del /S /Q ${env.WORKSPACE}\\pkg_vc14_cpu\\python\\*.pyc
     C:\\mxnet\\test_cpu.bat"""
-                            bat """xcopy C:\\mxnet\\data data /E /I /Y
+          }
+         }
+       },
+       'Python 3: CPU Win': {
+          node('mxnetwindows') {
+          ws('workspace/ut-python-cpu') {
+            init_git_win()
+            unstash 'vc14_cpu'
+            bat '''rmdir /s/q pkg_vc14_cpu
+    7z x -y vc14_cpu.7z'''
+          bat """xcopy C:\\mxnet\\data data /E /I /Y
     xcopy C:\\mxnet\\model model /E /I /Y
-    call activate py2
+    call activate py3
     set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_cpu\\python
     del /S /Q ${env.WORKSPACE}\\pkg_vc14_cpu\\python\\*.pyc
     C:\\mxnet\\test_cpu.bat"""
           }
          }
        },
-       'Python2/3: GPU Win':{
+       'Python 3: GPU Win':{
          node('mxnetwindows') {
            ws('workspace/ut-python-gpu') {
              init_git_win()
@@ -377,6 +387,16 @@ try {
     set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu\\python
     del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu\\python\\*.pyc
     C:\\mxnet\\test_gpu.bat"""
+           }
+         }
+       },
+       'Python 2: GPU Win':{
+         node('mxnetwindows') {
+           ws('workspace/ut-python-gpu') {
+             init_git_win()
+             unstash 'vc14_gpu'
+             bat '''rmdir /s/q pkg_vc14_gpu
+    7z x -y vc14_gpu.7z'''
              bat """xcopy C:\\mxnet\\data data /E /I /Y
     xcopy C:\\mxnet\\model model /E /I /Y
     call activate py2
@@ -385,7 +405,7 @@ try {
     C:\\mxnet\\test_gpu.bat"""
            }
          }
-       }
+        }
     }
 
     stage('Integration Test') {

From f7112040b1b0bbcd7c9db8f45db07a002af6f9ca Mon Sep 17 00:00:00 2001
From: Rahul Huilgol <huilgolr@amazon.com>
Date: Mon, 28 Aug 2017 17:12:10 -0700
Subject: [PATCH 2/2] reordered for clarity

---
 Jenkinsfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c54d16792d33..fe0151a879d6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -374,7 +374,7 @@ try {
           }
          }
        },
-       'Python 3: GPU Win':{
+       'Python 2: GPU Win':{
          node('mxnetwindows') {
            ws('workspace/ut-python-gpu') {
              init_git_win()
@@ -383,14 +383,14 @@ try {
     7z x -y vc14_gpu.7z'''
              bat """xcopy C:\\mxnet\\data data /E /I /Y
     xcopy C:\\mxnet\\model model /E /I /Y
-    call activate py3
+    call activate py2
     set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu\\python
     del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu\\python\\*.pyc
     C:\\mxnet\\test_gpu.bat"""
            }
          }
        },
-       'Python 2: GPU Win':{
+       'Python 3: GPU Win':{
          node('mxnetwindows') {
            ws('workspace/ut-python-gpu') {
              init_git_win()
@@ -399,7 +399,7 @@ try {
     7z x -y vc14_gpu.7z'''
              bat """xcopy C:\\mxnet\\data data /E /I /Y
     xcopy C:\\mxnet\\model model /E /I /Y
-    call activate py2
+    call activate py3
     set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu\\python
     del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu\\python\\*.pyc
     C:\\mxnet\\test_gpu.bat"""