From a0e728b5c8e99d140f6398c34c4634c79eac29ff Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 7 Jul 2022 15:40:53 +0200 Subject: [PATCH 1/2] Use centos:stream8 image for signing Signed-off-by: Evan Lezar --- scripts/Dockerfile.sign.rpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Dockerfile.sign.rpm b/scripts/Dockerfile.sign.rpm index 900cd305..93634234 100644 --- a/scripts/Dockerfile.sign.rpm +++ b/scripts/Dockerfile.sign.rpm @@ -1,3 +1,3 @@ -FROM centos:8 +FROM quay.io/centos/centos:stream8 RUN yum install -y createrepo rpm-sign pinentry From 18eb3c7c3883b3cfcd3b60466f0757973b15a85c Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 7 Jul 2022 15:41:17 +0200 Subject: [PATCH 2/2] Skip packages that already exist For rc releases we allow nvidia-container-toolkit versions to not match libnvidia-container versions. This change ensures that only changed packages are released. Signed-off-by: Evan Lezar --- scripts/release-packages.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/scripts/release-packages.sh b/scripts/release-packages.sh index 88bce898..25ca7bed 100755 --- a/scripts/release-packages.sh +++ b/scripts/release-packages.sh @@ -116,8 +116,19 @@ function sync() { return fi mkdir -p ${dst} - cp ${src}/libnvidia-container*.${pkg_type} ${dst} - cp ${src}/nvidia-container-toolkit*.${pkg_type} ${dst} + + for f in $(ls ${src}/libnvidia-container*.${pkg_type} ${src}/nvidia-container-toolkit*.${pkg_type}); do + df=${dst}/$(basename ${f}) + df_stable=${df//"/experimental/"/"/stable/"} + if [[ -f "${df}" ]]; then + echo "${df} already exists; skipping" + elif [[ ${REPO} == "experimental" && -f ${df_stable} ]]; then + echo "${df_stable} already exists; skipping" + else + cp ${f} ${df} + fi + + done if [[ ${REPO} == "stable" ]]; then cp ${src}/nvidia-container-runtime*.${pkg_type} ${dst} cp ${src}/nvidia-docker*.${pkg_type} ${dst}