From b4732a9bf9406abd51b59370d214de511092c407 Mon Sep 17 00:00:00 2001
From: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
Date: Tue, 30 Apr 2019 17:51:40 -0500
Subject: [PATCH] pkgs: factor out commit size for image version.

Image tarball size is the same as the one defined
in lib, factor out to avoid future errors if is modified.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
---
 obs-packaging/kata-containers-image/build_image.sh | 3 ++-
 obs-packaging/kata-containers-image/update.sh      | 2 +-
 obs-packaging/qemu-lite/update.sh                  | 2 +-
 obs-packaging/qemu-vanilla/update.sh               | 2 +-
 obs-packaging/scripts/pkglib.sh                    | 4 +++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/obs-packaging/kata-containers-image/build_image.sh b/obs-packaging/kata-containers-image/build_image.sh
index 6827c3df9..7a28c5c72 100755
--- a/obs-packaging/kata-containers-image/build_image.sh
+++ b/obs-packaging/kata-containers-image/build_image.sh
@@ -20,6 +20,7 @@ export   GOPATH="${tmp_dir}/go"
 
 export GOPATH=${GOPATH:-${HOME}/go}
 source "${script_dir}/../../scripts/lib.sh"
+source "${script_dir}/../scripts/pkglib.sh"
 
 exit_handler() {
 	[ -d "${tmp_dir}" ] && sudo rm -rf "$tmp_dir"
@@ -62,7 +63,7 @@ build_image() {
 create_tarball() {
 	agent_sha=$(get_repo_hash "${GOPATH}/src/github.com/kata-containers/agent")
 	#reduce sha size for short names
-	agent_sha=${agent_sha:0:11}
+	agent_sha=${agent_sha:0:${short_commit_length}}
 	tarball_name="kata-containers-${kata_osbuilder_version}-${agent_sha}-${arch_target}.tar.gz"
 	image_name="kata-containers-image_${img_distro}_${kata_osbuilder_version}_agent_${agent_sha}.img"
 	initrd_name="kata-containers-initrd_${initrd_distro}_${kata_osbuilder_version}_agent_${agent_sha}.initrd"
diff --git a/obs-packaging/kata-containers-image/update.sh b/obs-packaging/kata-containers-image/update.sh
index 839447e98..d8e957364 100755
--- a/obs-packaging/kata-containers-image/update.sh
+++ b/obs-packaging/kata-containers-image/update.sh
@@ -48,7 +48,7 @@ replace_list=(
 
 verify
 rm -rf kata-containers.tar.gz
-image_tarball=$(find . -name 'kata-containers-'"${VERSION/\~/-}"'-'"${kata_agent_hash:0:11}"'-*.tar.gz')
+image_tarball=$(find . -name 'kata-containers-'"${VERSION/\~/-}"'-'"${kata_agent_hash:0:${short_commit_length}}"'-*.tar.gz')
 [ -f "${image_tarball}" ] || die "image not found"
 cp "${image_tarball}" kata-containers.tar.gz
 
diff --git a/obs-packaging/qemu-lite/update.sh b/obs-packaging/qemu-lite/update.sh
index f7aeea90b..8e20dfa27 100755
--- a/obs-packaging/qemu-lite/update.sh
+++ b/obs-packaging/qemu-lite/update.sh
@@ -38,7 +38,7 @@ set_versions "${qemu_lite_hash}"
 replace_list=(
 	"VERSION=$VERSION"
 	"RELEASE=$RELEASE"
-	"QEMU_LITE_HASH=${qemu_lite_hash:0:10}"
+	"QEMU_LITE_HASH=${qemu_lite_hash:0:${short_commit_length}}"
 )
 verify
 echo "Verify succeed."
diff --git a/obs-packaging/qemu-vanilla/update.sh b/obs-packaging/qemu-vanilla/update.sh
index f47e9a50b..4060974ba 100755
--- a/obs-packaging/qemu-vanilla/update.sh
+++ b/obs-packaging/qemu-vanilla/update.sh
@@ -39,7 +39,7 @@ set_versions "${qemu_vanilla_hash}"
 replace_list=(
 	"VERSION=$VERSION"
 	"RELEASE=$RELEASE"
-	"QEMU_VANILLA_HASH=${qemu_vanilla_hash:0:10}"
+	"QEMU_VANILLA_HASH=${qemu_vanilla_hash:0:${short_commit_length}}"
 )
 
 verify
diff --git a/obs-packaging/scripts/pkglib.sh b/obs-packaging/scripts/pkglib.sh
index 52b0cd622..0de4f0336 100644
--- a/obs-packaging/scripts/pkglib.sh
+++ b/obs-packaging/scripts/pkglib.sh
@@ -26,6 +26,8 @@ VERBOSE=false
 # package was compiled for.
 DEB_ARCH="$(go env GOARCH)"
 
+short_commit_length=7
+
 if command -v go; then
 	export GO_ARCH=$(go env GOARCH)
 else
@@ -295,7 +297,7 @@ function pkg_version() {
 	pkg_version="${project_version}"
 
 	if [ -n "$commit_id" ]; then
-		pkg_version+="+git.${commit_id:0:7}"
+		pkg_version+="+git.${commit_id:0:${short_commit_length}}"
 	fi
 	if [ -n "$pkg_release" ]; then
 		pkg_version+="-${pkg_release}"