From e8cc7c2e40180a1173c115ca9e4e9dbafdb4481f Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Mon, 26 Mar 2018 15:21:45 +0530
Subject: [PATCH] [ci] Get CI builds to work again (#377)

* [ci] Enable tests against HCC from ROCm1.7 as well

* [ci] rocm 1.7 requires nodes with dkms label

* [ci] Temporarily drop hcc_1_6 and hcc_1_7 builds
---
 hipamd/Jenkinsfile | 41 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/hipamd/Jenkinsfile b/hipamd/Jenkinsfile
index 4ecad7facf..cfbe6cd883 100644
--- a/hipamd/Jenkinsfile
+++ b/hipamd/Jenkinsfile
@@ -359,7 +359,7 @@ if( params.hcc_integration_test )
 
   node('docker && rocm')
   {
-    hcc_integration_testing( '--device=/dev/kfd', 'hcc-ctu', build_config )
+    hcc_integration_testing( '--device=/dev/kfd --device=/dev/dri --group-add=video', 'hcc-ctu', build_config )
   }
 
   return
@@ -407,9 +407,10 @@ parallel hcc_ctu:
     docker_clean_images( job_name, hip_image_name )
   }
 },
+/*
 hcc_1_6:
 {
-  node('docker && rocm && !dkms')
+  node('docker && rocm')
   {
     String hcc_ver = 'hcc-1.6'
     String from_image = 'rocm/dev-ubuntu-16.04:1.6.4'
@@ -442,6 +443,42 @@ hcc_1_6:
     // docker_clean_images( job_name, hip_image_name )
   }
 },
+hcc_1_7:
+{
+  node('docker && rocm && dkms')
+  {
+    String hcc_ver = 'hcc-1.7'
+    String from_image = 'rocm/dev-ubuntu-16.04:latest'
+    String inside_args = '--device=/dev/kfd --device=/dev/dri --group-add=video'
+
+    // Checkout source code, dependencies and version files
+    String source_hip_rel = checkout_and_version( hcc_ver )
+
+    // Create/reuse a docker image that represents the hip build environment
+    def hip_build_image = docker_build_image( hcc_ver, 'hip', ' --pull', source_hip_rel, from_image )
+
+    // Print system information for the log
+    hip_build_image.inside( inside_args )
+    {
+      sh  """#!/usr/bin/env bash
+          set -x
+          /opt/rocm/bin/rocm_agent_enumerator -t ALL
+          /opt/rocm/bin/hcc --version
+        """
+    }
+
+    // Conctruct a binary directory path based on build config
+    String build_hip_rel = build_directory_rel( build_config );
+
+    // Build hip inside of the build environment
+    docker_build_inside_image( hip_build_image, inside_args, hcc_ver, '', build_config, source_hip_rel, build_hip_rel )
+
+    // Not pushing hip-hcc-1.7 builds at this time; saves a minute and nobody needs?
+    // String hip_image_name = docker_upload_artifactory( hcc_ver, job_name, from_image, source_hip_rel, build_hip_rel )
+    // docker_clean_images( job_name, hip_image_name )
+  }
+},
+*/
 nvcc:
 {
   node('docker && cuda')