Rework init repo for centos8 release tests

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2021-11-16 15:00:58 +01:00
parent 2ee6ec5d17
commit 6731f050da
4 changed files with 29 additions and 7 deletions

View File

@ -13,7 +13,6 @@
# limitations under the License. # limitations under the License.
WORKFLOW ?= nvidia-docker WORKFLOW ?= nvidia-docker
TEST_REPO ?= elezar.github.io
DISTRIBUTIONS := ubuntu18.04 centos8 DISTRIBUTIONS := ubuntu18.04 centos8
@ -30,7 +29,6 @@ images: $(IMAGE_TARGETS)
$(IMAGE_TARGETS): image-%: $(IMAGE_TARGETS): image-%:
docker build \ docker build \
--build-arg WORKFLOW="$(WORKFLOW)" \ --build-arg WORKFLOW="$(WORKFLOW)" \
--build-arg TEST_REPO="$(TEST_REPO)" \
-t nvidia-container-toolkit-repo-test:$(*) \ -t nvidia-container-toolkit-repo-test:$(*) \
-f $(DOCKERFILE) \ -f $(DOCKERFILE) \
$(shell dirname $(DOCKERFILE)) $(shell dirname $(DOCKERFILE))

View File

@ -25,11 +25,10 @@ RUN fpm -s empty \
ARG WORKFLOW=nvidia-docker ARG WORKFLOW=nvidia-docker
ARG TEST_REPO=nvidia.github.io
ENV TEST_REPO ${TEST_REPO}
RUN curl -s -L https://nvidia.github.io/${WORKFLOW}/centos8/nvidia-docker.repo \ RUN curl -s -L https://nvidia.github.io/${WORKFLOW}/centos8/nvidia-docker.repo \
| tee /etc/yum.repos.d/nvidia-docker.repo | tee /etc/yum.repos.d/nvidia-docker.repo
COPY entrypoint.sh / COPY entrypoint.sh /
COPY install_repo.sh /
ENTRYPOINT [ "/entrypoint.sh" ] ENTRYPOINT [ "/entrypoint.sh" ]

View File

@ -33,10 +33,10 @@ gpgcheck=0
protect=1 protect=1
EOL EOL
yum-config-manager --enable local-repository yum-config-manager --enable local-repository
elif [[ -n ${TEST_REPO} ]]; then
./install_repo.sh ${TEST_REPO}
else else
echo "Setting up TEST repo: ${TEST_REPO}" echo "Skipping repo setup"
sed -i -e 's#nvidia\.github\.io/libnvidia-container#${TEST_REPO}/libnvidia-container#g' /etc/yum.repos.d/nvidia-docker.repo
yum-config-manager --enable libnvidia-container-experimental
fi fi
exec bash $@ exec bash $@

View File

@ -0,0 +1,25 @@
#!/usr/bin/env bash
# Copyright (c) 2021, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# This script is used to build the packages for the components of the NVIDIA
# Container Stack. These include the nvidia-container-toolkit in this repository
# as well as the components included in the third_party folder.
# All required packages are generated in the specified dist folder.
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
yum-config-manager --enable libnvidia-container-experimental