UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 08:18:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'update-kitmaker-folders' into 'main'

Browse Source 
Update kitmaker target folder

See merge request nvidia/container-toolkit/container-toolkit!313
This commit is contained in:
Evan Lezar 2023-03-06 11:16:49 +00:00
commit f36c514f1f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.nvidia-ci.yml
View File

@ -36,8 +36,7 @@ variables:
STAGING_REGISTRY: registry.gitlab.com/nvidia/container-toolkit/container-toolkit/staging STAGING_REGISTRY: registry.gitlab.com/nvidia/container-toolkit/container-toolkit/staging
STAGING_VERSION: ${CI_COMMIT_SHORT_SHA} STAGING_VERSION: ${CI_COMMIT_SHORT_SHA}
ARTIFACTORY_REPO_BASE: "https://urm.nvidia.com/artifactory/sw-gpu-cloudnative" ARTIFACTORY_REPO_BASE: "https://urm.nvidia.com/artifactory/sw-gpu-cloudnative"
# TODO: We should set the kitmaker release folder here once we have the end-to-end workflow set up KITMAKER_RELEASE_FOLDER: "kitmaker"
KITMAKER_RELEASE_FOLDER: "testing"
.image-pull: .image-pull:
stage: image-build stage: image-build

1
build/container/Dockerfile.packaging
View File

@ -29,6 +29,7 @@ ARG PACKAGE_DIST
ARG PACKAGE_VERSION ARG PACKAGE_VERSION
ARG GIT_BRANCH ARG GIT_BRANCH
ARG GIT_COMMIT ARG GIT_COMMIT
ARG GIT_COMMIT_SHORT
ARG SOURCE_DATE_EPOCH ARG SOURCE_DATE_EPOCH
ARG VERSION ARG VERSION

7
scripts/release-kitmaker-artifactory.sh
View File

@ -77,7 +77,7 @@ function extract_info() {
IMAGE_EPOCH=$(extract_info "IMAGE_EPOCH") IMAGE_EPOCH=$(extract_info "IMAGE_EPOCH")
# Note we use the main branch for the kitmaker archive. # Note we use the main branch for the kitmaker archive.
GIT_BRANCH=main GIT_BRANCH=main
GIT_COMMIT=$(extract_info "GIT_COMMIT") GIT_COMMIT_SHORT=$(extract_info "GIT_COMMIT_SHORT")
VERSION=$(extract_info "PACKAGE_VERSION") VERSION=$(extract_info "PACKAGE_VERSION")
@ -155,7 +155,7 @@ function upload_archive() {
fi fi
local sha1_checksum=$(sha1sum -b "${archive}" | awk '{ print $1 }') local sha1_checksum=$(sha1sum -b "${archive}" | awk '{ print $1 }')
local upload_url="${KITMAKER_ARTIFACTORY_REPO}/${component}-${GIT_BRANCH}/default/$(basename ${archive})" local upload_url="${KITMAKER_ARTIFACTORY_REPO}/${GIT_BRANCH}/${component}/${os}-${arch}/${version}/$(basename ${archive})"
local props=() local props=()
# Required KITMAKER properties: # Required KITMAKER properties:
@ -164,8 +164,7 @@ function upload_archive() {
props+=("os=${os}") props+=("os=${os}")
props+=("arch=${arch}") props+=("arch=${arch}")
props+=("platform=${os}-${arch}") props+=("platform=${os}-${arch}")
# TODO: extract the GIT commit from the packaging image props+=("changelist=${GIT_COMMIT_SHORT}")
props+=("changelist=${GIT_COMMIT}")
props+=("branch=${GIT_BRANCH}") props+=("branch=${GIT_BRANCH}")
# Package properties: # Package properties:
props+=("package.epoch=${IMAGE_EPOCH}") props+=("package.epoch=${IMAGE_EPOCH}")

1
versions.mk
View File

@ -34,5 +34,6 @@ CUDA_VERSION := 12.0.1
GOLANG_VERSION := 1.18.8 GOLANG_VERSION := 1.18.8
GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "") GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "")
GIT_COMMIT_SHORT ?= $(shell git git rev-parse --short HEAD 2> /dev/null || echo "")
GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "${GIT_COMMIT}") GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "${GIT_COMMIT}")
SOURCE_DATE_EPOCH ?= $(shell git log -1 --format=%ct 2> /dev/null || echo "") SOURCE_DATE_EPOCH ?= $(shell git log -1 --format=%ct 2> /dev/null || echo "")