From 90a5c4db9d3466bd5e2a42bb831da624c3e1194b Mon Sep 17 00:00:00 2001
From: Rory Mitchell <r.a.mitchell.nz@gmail.com>
Date: Fri, 4 May 2018 16:50:59 +1200
Subject: [PATCH] Update Jenkins CI for GPU (#3294)

---
 Jenkinsfile                | 8 +++-----
 tests/ci_build/test_gpu.sh | 5 +++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 31cbba16a..3613c318f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,7 +8,7 @@ dockerRun = 'tests/ci_build/ci_build.sh'
 
 def buildMatrix = [
     [ "enabled": true,  "os" : "linux", "withGpu": true,  "withOmp": true, "pythonVersion": "2.7" ],
-    [ "enabled": true,  "os" : "linux", "withGpu": false, "withOmp": true, "pythonVersion": "2.7" ],
+    [ "enabled": false,  "os" : "linux", "withGpu": false, "withOmp": true, "pythonVersion": "2.7" ],
     [ "enabled": false, "os" : "osx",   "withGpu": false, "withOmp": false, "pythonVersion": "2.7" ],
 ]
 
@@ -69,8 +69,7 @@ def buildFactory(buildName, conf) {
     def os = conf["os"]
     def nodeReq = conf["withGpu"] ? "${os} && gpu" : "${os}"
     def dockerTarget = conf["withGpu"] ? "gpu" : "cpu"
-    [ ("cmake_${buildName}") : { buildPlatformCmake("cmake_${buildName}", conf, nodeReq, dockerTarget) },
-      ("make_${buildName}") : { buildPlatformMake("make_${buildName}", conf, nodeReq, dockerTarget) }
+    [ ("cmake_${buildName}") : { buildPlatformCmake("cmake_${buildName}", conf, nodeReq, dockerTarget) }
     ]
 }
 
@@ -129,7 +128,6 @@ def buildPlatformMake(buildName, conf, nodeReq, dockerTarget) {
 
 def makeOptions(conf) {
     return ([
-        conf["withGpu"] ? 'PLUGIN_UPDATER_GPU=ON' : 'PLUGIN_UPDATER_GPU=OFF',
         conf["withOmp"] ? 'USE_OPENMP=1' : 'USE_OPENMP=0']
         ).join(" ")
 }
@@ -137,7 +135,7 @@ def makeOptions(conf) {
 
 def cmakeOptions(conf) {
     return ([
-        conf["withGpu"] ? '-DPLUGIN_UPDATER_GPU:BOOL=ON' : '',
+        conf["withGpu"] ? '-DUSE_CUDA=ON' : '-DUSE_CUDA=OFF',
         conf["withOmp"] ? '-DOPEN_MP:BOOL=ON' : '']
         ).join(" ")
 }
diff --git a/tests/ci_build/test_gpu.sh b/tests/ci_build/test_gpu.sh
index 816b754d8..146bdb5d9 100755
--- a/tests/ci_build/test_gpu.sh
+++ b/tests/ci_build/test_gpu.sh
@@ -2,5 +2,6 @@
 
 cd python-package
 python setup.py install --user
-cd ../plugin/updater_gpu
-python -m nose test/python
+cd ..
+python -m nose tests/python-gpu
+