From d578f4598a3f3bc5bae494dec65790f898f66ec4 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 31 Jan 2023 15:35:14 +0100 Subject: [PATCH 1/4] Remove fedora35 pipeline targets Signed-off-by: Evan Lezar --- .common-ci.yml | 7 ------- .gitlab-ci.yml | 16 ---------------- 2 files changed, 23 deletions(-) diff --git a/.common-ci.yml b/.common-ci.yml index c28bf25e..afd01f50 100644 --- a/.common-ci.yml +++ b/.common-ci.yml @@ -77,13 +77,6 @@ stages: DIST: debian9 PACKAGE_REPO_TYPE: debian -.dist-fedora35: - rules: - - !reference [.main-or-manual, rules] - variables: - DIST: fedora35 - PACKAGE_REPO_TYPE: rpm - .dist-opensuse-leap15.1: rules: - !reference [.main-or-manual, rules] diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5693a885..0517f9c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -158,18 +158,6 @@ package-debian9-amd64: - .dist-debian9 - .arch-amd64 -package-fedora35-aarch64: - extends: - - .package-build - - .dist-fedora35 - - .arch-aarch64 - -package-fedora35-x86_64: - extends: - - .package-build - - .dist-fedora35 - - .arch-x86_64 - package-opensuse-leap15.1-x86_64: extends: - .package-build @@ -300,10 +288,6 @@ image-packaging: optional: true - job: package-debian9-amd64 optional: true - - job: package-fedora35-aarch64 - optional: true - - job: package-fedora35-x86_64 - optional: true - job: package-opensuse-leap15.1-x86_64 optional: true - job: package-ubuntu16.04-amd64 From 7cb9ed66bee9a5de79bdcf118bced428deaf7037 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 13 Feb 2023 10:58:47 +0100 Subject: [PATCH 2/4] Align release candidate RPM version with Debian version The version for RPM release candidates has the form `1.13.0-0.1.rc.1-1` whereas debian packages have the form `1.13.0~rc.1-1`. Note that since the `~` is handled in [the same way](https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_handling_non_sorting_versions_with_tilde_dot_and_caret) as for Debian packages, there does not seem to be a specific reason for this and dealing with multiple version strings in our entire pipeline adds complexity. This change aligns the package versioning for rpm packages with Debian packages. Signed-off-by: Evan Lezar --- docker/docker.mk | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/docker/docker.mk b/docker/docker.mk index 7ba6efd5..372a3a35 100644 --- a/docker/docker.mk +++ b/docker/docker.mk @@ -88,30 +88,24 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \ LIBNVIDIA_CONTAINER_VERSION ?= $(LIB_VERSION) LIBNVIDIA_CONTAINER_TAG ?= $(LIB_TAG) +LIB_VERSION := $(LIB_VERSION)$(if $(LIB_TAG),~$(LIB_TAG)) +PKG_REV := 1 +LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)$(if $(LIBNVIDIA_CONTAINER_TAG),~$(LIBNVIDIA_CONTAINER_TAG))-1 + # private ubuntu target --ubuntu%: OS := ubuntu ---ubuntu%: LIB_VERSION := $(LIB_VERSION)$(if $(LIB_TAG),~$(LIB_TAG)) ---ubuntu%: LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)$(if $(LIBNVIDIA_CONTAINER_TAG),~$(LIBNVIDIA_CONTAINER_TAG))-1 ---ubuntu%: PKG_REV := 1 # private debian target --debian%: OS := debian ---debian%: LIB_VERSION := $(LIB_VERSION)$(if $(LIB_TAG),~$(LIB_TAG)) ---debian%: LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)$(if $(LIBNVIDIA_CONTAINER_TAG),~$(LIBNVIDIA_CONTAINER_TAG))-1 ---debian%: PKG_REV := 1 # private centos target --centos%: OS := centos ---centos%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) ---centos%: LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)-$(if $(LIBNVIDIA_CONTAINER_TAG),0.1.$(LIBNVIDIA_CONTAINER_TAG),1) --centos%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum --centos%: CONFIG_TOML_SUFFIX := rpm-yum --centos8%: BASEIMAGE = quay.io/centos/centos:stream8 # private fedora target --fedora%: OS := fedora ---fedora%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) ---fedora%: LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)-$(if $(LIBNVIDIA_CONTAINER_TAG),0.1.$(LIBNVIDIA_CONTAINER_TAG),1) --fedora%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum --fedora%: CONFIG_TOML_SUFFIX := rpm-yum # The fedora(35) base image has very slow performance when building aarch64 packages. @@ -120,21 +114,15 @@ LIBNVIDIA_CONTAINER_TAG ?= $(LIB_TAG) # private amazonlinux target --amazonlinux%: OS := amazonlinux ---amazonlinux%: LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)-$(if $(LIBNVIDIA_CONTAINER_TAG),0.1.$(LIBNVIDIA_CONTAINER_TAG),1) ---amazonlinux%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) --amazonlinux%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum --amazonlinux%: CONFIG_TOML_SUFFIX := rpm-yum # private opensuse-leap target --opensuse-leap%: OS = opensuse-leap --opensuse-leap%: BASEIMAGE = opensuse/leap:$(VERSION) ---opensuse-leap%: LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)-$(if $(LIBNVIDIA_CONTAINER_TAG),0.1.$(LIBNVIDIA_CONTAINER_TAG),1) ---opensuse-leap%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) # private rhel target (actually built on centos) --rhel%: OS := centos ---rhel%: LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)-$(if $(LIBNVIDIA_CONTAINER_TAG),0.1.$(LIBNVIDIA_CONTAINER_TAG),1) ---rhel%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) --rhel%: VERSION = $(patsubst rhel%-$(ARCH),%,$(TARGET_PLATFORM)) --rhel%: ARTIFACTS_DIR = $(DIST_DIR)/rhel$(VERSION)/$(ARCH) --rhel%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum From f2b19b6ae9d87064b1bc603f1ac87ff71c696678 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 13 Feb 2023 14:39:14 +0100 Subject: [PATCH 3/4] Update libnvidia-container Signed-off-by: Evan Lezar --- third_party/libnvidia-container | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container index 7678e1af..b829d268 160000 --- a/third_party/libnvidia-container +++ b/third_party/libnvidia-container @@ -1 +1 @@ -Subproject commit 7678e1af094d865441d0bc1b97c3e72d15fcab50 +Subproject commit b829d268615917cf93bdb9fe665ba518eeed44a7 From 5aca0d147db3297e2d15aa06c59f49e9f780f40b Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 13 Feb 2023 15:10:08 +0100 Subject: [PATCH 4/4] Use - as version-tag separator for libnvidia-container Signed-off-by: Evan Lezar --- scripts/get-component-versions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/get-component-versions.sh b/scripts/get-component-versions.sh index 3c82e7e2..4e4f3c31 100755 --- a/scripts/get-component-versions.sh +++ b/scripts/get-component-versions.sh @@ -36,9 +36,9 @@ NVIDIA_DOCKER_ROOT=${PROJECT_ROOT}/third_party/nvidia-docker # Get version for libnvidia-container libnvidia_container_version_tag=$(grep "#define NVC_VERSION" ${LIBNVIDIA_CONTAINER_ROOT}/src/nvc.h \ | sed -e 's/#define NVC_VERSION[[:space:]]"\(.*\)"/\1/') -libnvidia_container_version=${libnvidia_container_version_tag%%~*} +libnvidia_container_version=${libnvidia_container_version_tag%%-*} libnvidia_container_tag=${libnvidia_container_version_tag##${libnvidia_container_version}} -libnvidia_container_tag=${libnvidia_container_tag##\~} +libnvidia_container_tag=${libnvidia_container_tag##\-} versions_makefile=${NVIDIA_CONTAINER_TOOLKIT_ROOT}/versions.mk # Get version for nvidia-container-toolit