From 86196a994bd82b74a2eaaa483970193f803380ae Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Fri, 7 Jul 2017 10:36:05 +0530
Subject: [PATCH 1/2] [ci] Use new repo server

[ROCm/clr commit: 6b0e0d11fced46c3d7f945465c0c865e2f5f8250]
---
 projects/clr/hipamd/docker/dockerfile-hip-ubuntu-16.04 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/clr/hipamd/docker/dockerfile-hip-ubuntu-16.04 b/projects/clr/hipamd/docker/dockerfile-hip-ubuntu-16.04
index cecf5911b8..054dea76ce 100644
--- a/projects/clr/hipamd/docker/dockerfile-hip-ubuntu-16.04
+++ b/projects/clr/hipamd/docker/dockerfile-hip-ubuntu-16.04
@@ -9,8 +9,8 @@ COPY *.deb /tmp/
 
 # Install the debian package
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl \
-  && curl -sL http://packages.amd.com/rocm/apt/debian/rocm.gpg.key | apt-key add - \
-  && echo deb [arch=amd64] http://packages.amd.com/rocm/apt/debian/ xenial main | tee /etc/apt/sources.list.d/rocm.list \
+  && curl -sL http://repo.radeon.com/rocm/apt/debian/rocm.gpg.key | apt-key add - \
+  && echo deb [arch=amd64] http://repo.radeon.com/rocm/apt/debian/ xenial main | tee /etc/apt/sources.list.d/rocm.list \
   && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --allow-unauthenticated -y \
     /tmp/hip_base-*.deb \
     /tmp/hip_hcc-*.deb \
@@ -18,4 +18,4 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal
     /tmp/hip_samples-* \
   && rm -f /tmp/*.deb \
   && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
\ No newline at end of file
+  && rm -rf /var/lib/apt/lists/*

From e10e7f4ccfe994fd644eb2a9e108b834812b9046 Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Tue, 11 Jul 2017 11:21:53 +0530
Subject: [PATCH 2/2] [ci] Pass IP for repo.radeon.com as docker buildargs

[ROCm/clr commit: 1478814402dbded5c30913275af3ec7a0774bce9]
---
 projects/clr/hipamd/Jenkinsfile                        | 6 +++---
 projects/clr/hipamd/docker/dockerfile-hip-ubuntu-16.04 | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/projects/clr/hipamd/Jenkinsfile b/projects/clr/hipamd/Jenkinsfile
index 16354285ec..62135e3cde 100644
--- a/projects/clr/hipamd/Jenkinsfile
+++ b/projects/clr/hipamd/Jenkinsfile
@@ -76,10 +76,10 @@ def docker_build_image( String platform, String source_hip_rel, String from_imag
 
       // Docker 17.05 introduced the ability to use ARG values in FROM statements
       // Docker inspect failing on FROM statements with ARG https://issues.jenkins-ci.org/browse/JENKINS-44836
-      //build_image = docker.build( "${project}/${build_image_name}:latest", "--pull -f docker/${dockerfile_name} --build-arg user_uid=${user_uid} --build-arg base_image=${from_image} ." )
+      //build_image = docker.build( "${project}/${build_image_name}:latest", "--pull -f docker/${dockerfile_name} --build-arg REPO_RADEON=10.255.8.5 --build-arg user_uid=${user_uid} --build-arg base_image=${from_image} ." )
 
       // JENKINS-44836 workaround
-      sh "docker build -t ${project}/${build_image_name}:latest --pull -f docker/${dockerfile_name} --build-arg user_uid=${user_uid} --build-arg base_image=${from_image} ."
+      sh "docker build -t ${project}/${build_image_name}:latest --pull -f docker/${dockerfile_name} --build-arg REPO_RADEON=10.255.8.5 --build-arg user_uid=${user_uid} --build-arg base_image=${from_image} ."
       build_image = docker.image( "${project}/${build_image_name}:latest" )
     }
   }
@@ -316,4 +316,4 @@ nvcc:
 
     // Not pushing an Nvidia based HiP to artifactory at this time
   }
-}
\ No newline at end of file
+}
diff --git a/projects/clr/hipamd/docker/dockerfile-hip-ubuntu-16.04 b/projects/clr/hipamd/docker/dockerfile-hip-ubuntu-16.04
index 054dea76ce..1272bf30af 100644
--- a/projects/clr/hipamd/docker/dockerfile-hip-ubuntu-16.04
+++ b/projects/clr/hipamd/docker/dockerfile-hip-ubuntu-16.04
@@ -1,5 +1,6 @@
 # Parameters related to building hip
 ARG base_image
+ARG REPO_RADEON=$REPO_RADEON
 
 FROM ${base_image}
 MAINTAINER Kent Knox <kent.knox@amd>
@@ -9,8 +10,8 @@ COPY *.deb /tmp/
 
 # Install the debian package
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl \
-  && curl -sL http://repo.radeon.com/rocm/apt/debian/rocm.gpg.key | apt-key add - \
-  && echo deb [arch=amd64] http://repo.radeon.com/rocm/apt/debian/ xenial main | tee /etc/apt/sources.list.d/rocm.list \
+  && curl -sL http://$REPO_RADEON/rocm/apt/debian/rocm.gpg.key | apt-key add - \
+  && echo deb [arch=amd64] http://$REPO_RADEON/rocm/apt/debian/ xenial main | tee /etc/apt/sources.list.d/rocm.list \
   && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --allow-unauthenticated -y \
     /tmp/hip_base-*.deb \
     /tmp/hip_hcc-*.deb \