From 003433c1a98d111c10e20666688e838467b9afd2 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Tue, 7 May 2019 13:58:56 -0500 Subject: [PATCH 1/4] docs: release: add step to generate version file before image. The image now is generated using versions file. It is not generated it will fail. Signed-off-by: Jose Carlos Venegas Munoz --- release/release.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/release.md b/release/release.md index 0f11549d42..1823436516 100644 --- a/release/release.md +++ b/release/release.md @@ -81,6 +81,8 @@ $ git pull 3. Create the Kata Containers image and upload it to GitHub: ```bash + $ cd ${GOPATH}/src/github.com/kata-containers/packaging/obs-packaging + $ ./gen_versions_txt.sh ${BRANCH} $ cd ${GOPATH}/src/github.com/kata-containers/packaging/release $ ./publish-kata-image.sh -p ${NEW_VERSION} ``` From 96779ec9e2272e35c670e1672183832ab041578c Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Tue, 7 May 2019 14:04:18 -0500 Subject: [PATCH 2/4] pkglib: fix sourced path Fix way to get path to sourced file. Signed-off-by: Jose Carlos Venegas Munoz --- obs-packaging/scripts/pkglib.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/obs-packaging/scripts/pkglib.sh b/obs-packaging/scripts/pkglib.sh index d9e15a4062..ba18564217 100644 --- a/obs-packaging/scripts/pkglib.sh +++ b/obs-packaging/scripts/pkglib.sh @@ -3,7 +3,8 @@ # This is a helper library for the setup scripts of each package # in this repository. -source_dir_pkg_lib=$(dirname "${BASH_SOURCE[ ${#BASH_SOURCE[@]} - 1 ]}") +source_dir_pkg_lib=$(dirname "${BASH_SOURCE[0]}") +source_dir_pkg_lib=$(realpath "${source_dir_pkg_lib}") source "${source_dir_pkg_lib}/../../scripts/lib.sh" source "${source_dir_pkg_lib}/../versions.txt" From 92f6ee8a64350d5a35a5000792b5a4adbaa470a5 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Tue, 7 May 2019 14:11:55 -0500 Subject: [PATCH 3/4] release: publish: image: fix commit length The commit length now is defined in a variable. Signed-off-by: Jose Carlos Venegas Munoz --- obs-packaging/download_image.sh | 5 ++++- release/publish-kata-image.sh | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/obs-packaging/download_image.sh b/obs-packaging/download_image.sh index 04548b58fe..f7f5721879 100755 --- a/obs-packaging/download_image.sh +++ b/obs-packaging/download_image.sh @@ -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}" diff --git a/release/publish-kata-image.sh b/release/publish-kata-image.sh index ebbd029183..08405d1449 100755 --- a/release/publish-kata-image.sh +++ b/release/publish-kata-image.sh @@ -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}" From 3a1bb3fb7a10dfb77dfb0a0b3b291840f50f4a67 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Tue, 7 May 2019 14:14:40 -0500 Subject: [PATCH 4/4] lib.sh: dont do readonly on sourced files. Files could be sourced more than one time lets not use readonly. Fixes: #487 Signed-off-by: Jose Carlos Venegas Munoz --- scripts/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib.sh b/scripts/lib.sh index 66a761c1a5..25b4976e33 100644 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -1,5 +1,5 @@ export GOPATH=${GOPATH:-${HOME}/go} -readonly kata_arch_sh="${GOPATH}/src/github.com/kata-containers/tests/.ci/kata-arch.sh" +kata_arch_sh="${GOPATH}/src/github.com/kata-containers/tests/.ci/kata-arch.sh" hub_bin="hub-bin" get_kata_arch() {