From 7ea34bbaab24efac272cdb57f2453bf53e9d1e32 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Fri, 3 Aug 2018 14:50:45 -0700
Subject: [PATCH 1/3] [CI] Simplify labeling rules

---
 Jenkinsfile | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8d76ebedeaae..843d9a707652 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,7 +36,7 @@ def init_git_win() {
 
 stage("Sanity Check") {
   timeout(time: max_time, unit: 'MINUTES') {
-    node('linux') {
+    node('CPU') {
       ws('workspace/tvm/sanity') {
         init_git()
         sh "${docker_run} tvmai/ci-lint  ./tests/scripts/task_lint.sh"
@@ -81,7 +81,7 @@ def unpack_lib(name, libs) {
 
 stage('Build') {
   parallel 'GPU': {
-    node('GPU' && 'linux') {
+    node('GPUBUILD') {
       ws('workspace/tvm/build-gpu') {
         init_git()
         sh """
@@ -118,7 +118,7 @@ stage('Build') {
     }
   },
   'CPU': {
-    node('CPU' && 'linux') {
+    node('CPU') {
       ws('workspace/tvm/build-cpu') {
         init_git()
         sh """
@@ -162,18 +162,19 @@ stage('Build') {
 
 stage('Unit Test') {
   parallel 'python2/3: GPU': {
-    node('GPU' && 'linux') {
+    node('GPU') {
       ws('workspace/tvm/ut-python-gpu') {
         init_git()
         unpack_lib('gpu', tvm_multilib)
         timeout(time: max_time, unit: 'MINUTES') {
           sh "${docker_run} tvmai/ci-gpu ./tests/scripts/task_python_unittest.sh"
+          sh "${docker_run} tvmai/ci-gpu ./tests/scripts/task_python_integration.sh"
         }
       }
     }
   },
   'python2/3: i386': {
-    node('CPU' && 'linux') {
+    node('CPU') {
       ws('workspace/tvm/ut-python-i386') {
         init_git()
         unpack_lib('i386', tvm_multilib)
@@ -186,7 +187,7 @@ stage('Unit Test') {
     }
   },
   'java': {
-    node('GPU' && 'linux') {
+    node('GPU') {
       ws('workspace/tvm/ut-java') {
         init_git()
         unpack_lib('gpu', tvm_multilib)
@@ -199,22 +200,32 @@ stage('Unit Test') {
 }
 
 stage('Integration Test') {
-  parallel 'python': {
-    node('GPU' && 'linux') {
+  parallel
+  'topi': {
+    node('GPU') {
       ws('workspace/tvm/it-python-gpu') {
         init_git()
         unpack_lib('gpu', tvm_multilib)
         timeout(time: max_time, unit: 'MINUTES') {
-          sh "${docker_run} tvmai/ci-gpu ./tests/scripts/task_python_integration.sh"
           sh "${docker_run} tvmai/ci-gpu ./tests/scripts/task_python_topi.sh"
           sh "${docker_run} tvmai/ci-gpu ./tests/scripts/task_cpp_topi.sh"
+        }
+      }
+    }
+  },
+  'nnvm': {
+    node('GPU') {
+      ws('workspace/tvm/it-python-gpu') {
+        init_git()
+        unpack_lib('gpu', tvm_multilib)
+        timeout(time: max_time, unit: 'MINUTES') {
           sh "${docker_run} tvmai/ci-gpu ./tests/scripts/task_python_nnvm.sh"
         }
       }
     }
   },
   'docs': {
-    node('GPU' && 'linux') {
+    node('GPU') {
       ws('workspace/tvm/docs-python-gpu') {
         init_git()
         unpack_lib('gpu', tvm_multilib)
@@ -228,7 +239,7 @@ stage('Integration Test') {
 }
 
 stage('Deploy') {
-    node('docker' && 'doc') {
+    node('doc') {
       ws('workspace/tvm/deploy-docs') {
         if (env.BRANCH_NAME == "master") {
            unpack_lib('mydocs', 'docs.tgz')

From 238d34d9ed6ead718d419ab58db5a27874fbe447 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Fri, 3 Aug 2018 14:55:34 -0700
Subject: [PATCH 2/3] fix syntax

---
 Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 843d9a707652..1ef5a3a3610f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -200,8 +200,7 @@ stage('Unit Test') {
 }
 
 stage('Integration Test') {
-  parallel
-  'topi': {
+  parallel 'topi': {
     node('GPU') {
       ws('workspace/tvm/it-python-gpu') {
         init_git()

From 4ee673ae1abb6c0d55866452649579aa938bc180 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Fri, 3 Aug 2018 15:01:18 -0700
Subject: [PATCH 3/3] more fix

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 1ef5a3a3610f..bec0d2be5df8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -80,7 +80,7 @@ def unpack_lib(name, libs) {
 }
 
 stage('Build') {
-  parallel 'GPU': {
+  parallel 'BUILD: GPU': {
     node('GPUBUILD') {
       ws('workspace/tvm/build-gpu') {
         init_git()
@@ -117,7 +117,7 @@ stage('Build') {
       }
     }
   },
-  'CPU': {
+  'BUILD: CPU': {
     node('CPU') {
       ws('workspace/tvm/build-cpu') {
         init_git()
@@ -139,8 +139,8 @@ stage('Build') {
       }
     }
   },
-  'i386': {
-    node('CPU' && 'linux') {
+  'BUILD : i386': {
+    node('CPU') {
       ws('workspace/tvm/build-i386') {
         init_git()
         sh """
@@ -186,7 +186,7 @@ stage('Unit Test') {
       }
     }
   },
-  'java': {
+  'java: GPU': {
     node('GPU') {
       ws('workspace/tvm/ut-java') {
         init_git()
@@ -200,7 +200,7 @@ stage('Unit Test') {
 }
 
 stage('Integration Test') {
-  parallel 'topi': {
+  parallel 'topi: GPU': {
     node('GPU') {
       ws('workspace/tvm/it-python-gpu') {
         init_git()
@@ -212,7 +212,7 @@ stage('Integration Test') {
       }
     }
   },
-  'nnvm': {
+  'nnvm: GPU': {
     node('GPU') {
       ws('workspace/tvm/it-python-gpu') {
         init_git()
@@ -223,7 +223,7 @@ stage('Integration Test') {
       }
     }
   },
-  'docs': {
+  'docs: GPU': {
     node('GPU') {
       ws('workspace/tvm/docs-python-gpu') {
         init_git()