From 8e8c41a3bc9c0aea595d075619ee72aebae85e8c Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 23 Aug 2022 21:17:00 +0200 Subject: [PATCH] Clean up repo test scripts Signed-off-by: Evan Lezar --- test/release/docker/centos8/Dockerfile | 5 ++--- test/release/docker/centos8/install_repo.sh | 2 +- test/release/docker/ubuntu18.04/Dockerfile | 5 ++--- test/release/docker/ubuntu18.04/install_repo.sh | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/test/release/docker/centos8/Dockerfile b/test/release/docker/centos8/Dockerfile index 32f966e3..ab2152c8 100644 --- a/test/release/docker/centos8/Dockerfile +++ b/test/release/docker/centos8/Dockerfile @@ -25,9 +25,8 @@ RUN fpm -s empty \ rm -f /tmp/docker.rpm -ARG WORKFLOW=nvidia-docker -RUN curl -s -L https://nvidia.github.io/${WORKFLOW}/centos8/nvidia-docker.repo \ - | tee /etc/yum.repos.d/nvidia-docker.repo +RUN curl -s -L https://nvidia.github.io/libnvidia-container/centos8/libnvidia-container.repo \ + | tee /etc/yum.repos.d/nvidia-container-toolkit.repo COPY entrypoint.sh / COPY install_repo.sh / diff --git a/test/release/docker/centos8/install_repo.sh b/test/release/docker/centos8/install_repo.sh index ae65fdf3..cb8b6a13 100755 --- a/test/release/docker/centos8/install_repo.sh +++ b/test/release/docker/centos8/install_repo.sh @@ -21,5 +21,5 @@ test_repo=$1 echo "Setting up TEST repo: ${test_repo}" -sed -i -e "s#nvidia\.github\.io/libnvidia-container#${test_repo}/libnvidia-container#g" /etc/yum.repos.d/nvidia-docker.repo +sed -i -e "s#nvidia\.github\.io/libnvidia-container#${test_repo}/libnvidia-container#g" /etc/yum.repos.d/nvidia-container-toolkit.repo yum-config-manager --enable libnvidia-container-experimental diff --git a/test/release/docker/ubuntu18.04/Dockerfile b/test/release/docker/ubuntu18.04/Dockerfile index a23cca21..e3ba89cb 100644 --- a/test/release/docker/ubuntu18.04/Dockerfile +++ b/test/release/docker/ubuntu18.04/Dockerfile @@ -39,9 +39,8 @@ RUN fpm -s empty \ rm -f /tmp/docker.deb -ARG WORKFLOW=nvidia-docker -RUN curl -s -L https://nvidia.github.io/${WORKFLOW}/gpgkey | apt-key add - \ - && curl -s -L https://nvidia.github.io/${WORKFLOW}/ubuntu18.04/nvidia-docker.list | tee /etc/apt/sources.list.d/nvidia-docker.list \ +RUN curl -s -L https://nvidia.github.io/libnvidia-container/gpgkey | apt-key add - \ + && curl -s -L https://nvidia.github.io/libnvidia-container/ubuntu18.04/libnvidia-container.list | tee /etc/apt/sources.list.d/nvidia-container-toolkit.list \ && apt-get update COPY entrypoint.sh / diff --git a/test/release/docker/ubuntu18.04/install_repo.sh b/test/release/docker/ubuntu18.04/install_repo.sh index a6c0d156..befad329 100755 --- a/test/release/docker/ubuntu18.04/install_repo.sh +++ b/test/release/docker/ubuntu18.04/install_repo.sh @@ -21,5 +21,5 @@ test_repo=$1 echo "Setting up TEST repo: ${test_repo}" -sed -i -e "s#nvidia\.github\.io/libnvidia-container#${test_repo}/libnvidia-container#g" /etc/apt/sources.list.d/nvidia-docker.list -sed -i -e '/experimental/ s/^#//g' /etc/apt/sources.list.d/nvidia-docker.list +sed -i -e "s#nvidia\.github\.io/libnvidia-container#${test_repo}/libnvidia-container#g" /etc/apt/sources.list.d/nvidia-container-toolkit.list +sed -i -e '/experimental/ s/^#//g' /etc/apt/sources.list.d/nvidia-container-toolkit.list