From 7955bb1a84fbc2b80073d3029bb3a7e1d3c2cb87 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Thu, 10 Nov 2022 15:52:27 +0100
Subject: [PATCH] Use short sha for kitmaker version

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 .nvidia-ci.yml                          | 1 +
 scripts/release-kitmaker-artifactory.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml
index 17b69050..a2954b24 100644
--- a/.nvidia-ci.yml
+++ b/.nvidia-ci.yml
@@ -311,6 +311,7 @@ scan-ubi8-arm64:
   needs:
     - image-packaging
   variables:
+    VERSION: "${CI_COMMIT_SHORT_SHA}"
     PACKAGE_REGISTRY: "${CI_REGISTRY}"
     PACKAGE_REGISTRY_USER: "${CI_REGISTRY_USER}"
     PACKAGE_REGISTRY_TOKEN: "${CI_REGISTRY_PASSWORD}"
diff --git a/scripts/release-kitmaker-artifactory.sh b/scripts/release-kitmaker-artifactory.sh
index 4d433f28..5b5d7bf0 100755
--- a/scripts/release-kitmaker-artifactory.sh
+++ b/scripts/release-kitmaker-artifactory.sh
@@ -209,7 +209,7 @@ function kitmakerize-distro() {
     rmdir "${scratch_dir}"
 }
 
-: "${VERSION=$(git describe --tags --dirty)}"
+: "${VERSION=$({NVIDIA_CONTAINER_TOOLKIT_PACKAGE_VERSION})}"
 kitmaker_name="${COMPONENT_NAME//-/_}-${DIST}-${ARCH}-${VERSION}"
 kitmaker_archive="${KITMAKER_DIR}/${kitmaker_name}.tar.gz"
 kitmakerize-distro "${DIST}" "${ARCH}" "${kitmaker_archive}"