Merge pull request #320 from kknox/fix-hcc-ctu-build-rebase

Fix hcc ctu build

[ROCm/hip commit: e9112426c3]

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'
+    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,11 +408,11 @@ parallel hcc_ctu:
 },
 hcc_1_6:
 {
-  node('docker && rocm')
+  node('docker && rocm && !dkms')
   {
     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 )

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/*