aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-04 23:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

release: publish: image: fix commit length

Browse Source 
The commit length now is defined in a variable.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz
2019-05-07 14:11:55 -05:00
parent 96779ec9e2
commit 92f6ee8a64
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
obs-packaging/download_image.sh
View File

@@ -8,6 +8,9 @@ set -o nounset
set -o pipefail
set -o errtrace
script_dir=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
source "${script_dir}/scripts/obs-docker.sh"
handle_error() {
local exit_code="${?}"
local line_number="${1:-}"
@@ -43,7 +46,7 @@ commit=$(echo "$tag_info" | awk '{print $1}')
echo "$commit"
agent_repository="github.com/kata-containers/agent"
tarball_name="kata-containers-${version}-${commit:0:11}-$(uname -m).tar.gz"
tarball_name="kata-containers-${version}-${commit:0:${short_commit_length}}-$(uname -m).tar.gz"
image_url="https://${agent_repository}/releases/download/${version}/${tarball_name}"
curl -OL "${image_url}"
tar xvf "${tarball_name}"

4
release/publish-kata-image.sh
View File

@@ -18,6 +18,7 @@ readonly project="kata-containers"
GOPATH=${GOPATH:-${HOME}/go}
source "${script_dir}/../scripts/lib.sh"
source "${script_dir}/../obs-packaging/scripts/pkglib.sh"
die() {
msg="$*"
@@ -59,8 +60,7 @@ main() {
[ -n "${kata_version}" ] || usage "1"
agent_sha=$(get_kata_hash_from_tag "agent" "${kata_version}")
# tarball only has 11 chars from agent sha
agent_sha=${agent_sha:0:11}
agent_sha=${agent_sha:0:${short_commit_length}}
image_tarball=$(find -name 'kata-containers-*.tar.gz' | grep "${kata_version}" | grep "${agent_sha}") ||
"${script_dir}/../obs-packaging/kata-containers-image/build_image.sh" -v "${kata_version}"
image_tarball=$(find -name 'kata-containers-*.tar.gz' | grep "${kata_version}" | grep "${agent_sha}" ) || die "file not found ${image_tarball}"