Use short sha for kitmaker version

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2022-11-10 15:52:27 +01:00
parent 75b11eb80a
commit 7955bb1a84
2 changed files with 2 additions and 1 deletions

View File

@ -311,6 +311,7 @@ scan-ubi8-arm64:
needs: needs:
- image-packaging - image-packaging
variables: variables:
VERSION: "${CI_COMMIT_SHORT_SHA}"
PACKAGE_REGISTRY: "${CI_REGISTRY}" PACKAGE_REGISTRY: "${CI_REGISTRY}"
PACKAGE_REGISTRY_USER: "${CI_REGISTRY_USER}" PACKAGE_REGISTRY_USER: "${CI_REGISTRY_USER}"
PACKAGE_REGISTRY_TOKEN: "${CI_REGISTRY_PASSWORD}" PACKAGE_REGISTRY_TOKEN: "${CI_REGISTRY_PASSWORD}"

View File

@ -209,7 +209,7 @@ function kitmakerize-distro() {
rmdir "${scratch_dir}" rmdir "${scratch_dir}"
} }
: "${VERSION=$(git describe --tags --dirty)}" : "${VERSION=$({NVIDIA_CONTAINER_TOOLKIT_PACKAGE_VERSION})}"
kitmaker_name="${COMPONENT_NAME//-/_}-${DIST}-${ARCH}-${VERSION}" kitmaker_name="${COMPONENT_NAME//-/_}-${DIST}-${ARCH}-${VERSION}"
kitmaker_archive="${KITMAKER_DIR}/${kitmaker_name}.tar.gz" kitmaker_archive="${KITMAKER_DIR}/${kitmaker_name}.tar.gz"
kitmakerize-distro "${DIST}" "${ARCH}" "${kitmaker_archive}" kitmakerize-distro "${DIST}" "${ARCH}" "${kitmaker_archive}"