From 3be321dfb6d6c341a9ed43c002e63ad35dd1ceba Mon Sep 17 00:00:00 2001
From: Kent Knox <kent.knox@amd>
Date: Wed, 10 Jan 2018 11:26:51 -0600
Subject: [PATCH 1/2] Adding dependencies for rocm_agent_enumerator

[ROCm/hip commit: 55fc302e3223c6a3c995143b14a2b7faa89307c5]
---
 projects/hip/Jenkinsfile                          | 6 +++---
 projects/hip/docker/dockerfile-build-ubuntu-16.04 | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/projects/hip/Jenkinsfile b/projects/hip/Jenkinsfile
index 12c9755103..ce6fbc2e9e 100644
--- a/projects/hip/Jenkinsfile
+++ b/projects/hip/Jenkinsfile
@@ -371,7 +371,7 @@ parallel hcc_ctu:
   {
     String hcc_ver = 'hcc-ctu'
     String from_image = 'compute-artifactory:5001/radeonopencompute/hcc/clang_tot_upgrade/hcc-lc-ubuntu-16.04:latest'
-    String inside_args = '--device=/dev/kfd'
+    String inside_args = '--device=/dev/kfd --device=/dev/dri'
 
     // Checkout source code, dependencies and version files
     String source_hip_rel = checkout_and_version( hcc_ver )
@@ -411,8 +411,8 @@ hcc_1_6:
   node('docker && rocm')
   {
     String hcc_ver = 'hcc-1.6'
-    String from_image = 'compute-artifactory:5001/radeonopencompute/hcc/roc-1.6.x/hcc-lc-ubuntu-16.04:latest'
-    String inside_args = '--device=/dev/kfd'
+    String from_image = 'rocm/dev-ubuntu-16.04:latest'
+    String inside_args = '--device=/dev/kfd --device=/dev/dri'
 
     // Checkout source code, dependencies and version files
     String source_hip_rel = checkout_and_version( hcc_ver )
diff --git a/projects/hip/docker/dockerfile-build-ubuntu-16.04 b/projects/hip/docker/dockerfile-build-ubuntu-16.04
index 031bf72437..8f655f7c78 100644
--- a/projects/hip/docker/dockerfile-build-ubuntu-16.04
+++ b/projects/hip/docker/dockerfile-build-ubuntu-16.04
@@ -7,6 +7,7 @@ MAINTAINER Kent Knox <kent.knox@amd>
 ARG user_uid
 
 # Install Packages
+# python and libnuma1 are dependencies of rocm_agent_enumerator
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     sudo \
     build-essential \
@@ -14,6 +15,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     git \
     libelf-dev \
     rpm \
+    python \
+    libnuma1 \
     && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*

From d027fd3394e067c3a8bd64c3044d50cd953659c4 Mon Sep 17 00:00:00 2001
From: Kent Knox <kent.knox@amd>
Date: Wed, 10 Jan 2018 13:28:18 -0600
Subject: [PATCH 2/2] adding group-add flag to docker run

[ROCm/hip commit: a9d34afc50f189af8fab23e0e56b099449397e35]
---
 projects/hip/Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/hip/Jenkinsfile b/projects/hip/Jenkinsfile
index ce6fbc2e9e..4909e666f0 100644
--- a/projects/hip/Jenkinsfile
+++ b/projects/hip/Jenkinsfile
@@ -367,11 +367,11 @@ if( params.hcc_integration_test )
 // The following launches 3 builds in parallel: hcc-ctu, hcc-1.6 and cuda
 parallel hcc_ctu:
 {
-  node('docker && rocm')
+  node('docker && rocm && dkms')
   {
     String hcc_ver = 'hcc-ctu'
     String from_image = 'compute-artifactory:5001/radeonopencompute/hcc/clang_tot_upgrade/hcc-lc-ubuntu-16.04:latest'
-    String inside_args = '--device=/dev/kfd --device=/dev/dri'
+    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 )
@@ -408,7 +408,7 @@ parallel hcc_ctu:
 },
 hcc_1_6:
 {
-  node('docker && rocm')
+  node('docker && rocm && !dkms')
   {
     String hcc_ver = 'hcc-1.6'
     String from_image = 'rocm/dev-ubuntu-16.04:latest'