github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-12 20:39:30 +00:00
Code Issues Projects Releases Wiki Activity

image: Make sure agent sha is correct

Browse Source 
Fix image generation.

Instead of use agent code from the host checkout to the
agent source code in a clean GOPATH env.

Make sure that the agent `commit id` is the correct before
push to github or OBS.

Fixes: #166

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz
2018-08-30 15:35:39 -05:00
parent fe2d20ee4f
commit 33214c90d6
5 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
obs-packaging/gen_versions_txt.sh
View File

@@ -15,11 +15,6 @@ project="kata-containers"
source "${script_dir}/../scripts/lib.sh" source "${script_dir}/../scripts/lib.sh"
get_kata_hash_from_tag() {
repo=$1
git ls-remote --tags "https://github.com/${project}/${repo}.git" | grep "refs/tags/${kata_version}^{}" | awk '{print $1}'
}
gen_version_file() { gen_version_file() {
local branch="$1" local branch="$1"
[ -n "${branch}" ] || exit 1 [ -n "${branch}" ] || exit 1

7
obs-packaging/kata-containers-image/build_image.sh
View File

@@ -16,10 +16,16 @@ readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
readonly project="kata-containers" readonly project="kata-containers"
readonly tmp_dir=$(mktemp -d -t build-image-tmp.XXXXXXXXXX) readonly tmp_dir=$(mktemp -d -t build-image-tmp.XXXXXXXXXX)
readonly osbuilder_url=https://github.com/${project}/osbuilder.git readonly osbuilder_url=https://github.com/${project}/osbuilder.git
export GOPATH="${tmp_dir}/go"
export GOPATH=${GOPATH:-${HOME}/go} export GOPATH=${GOPATH:-${HOME}/go}
source "${script_dir}/../../scripts/lib.sh" source "${script_dir}/../../scripts/lib.sh"
exit_handler() {
[ -d "${tmp_dir}" ] && sudo rm -rf "$tmp_dir"
}
trap exit_handler EXIT
arch_target="$(uname -m)" arch_target="$(uname -m)"
kata_version="master" kata_version="master"
@@ -47,6 +53,7 @@ build_image() {
sudo -E PATH="${PATH}" make image \ sudo -E PATH="${PATH}" make image \
DISTRO="${img_distro}" \ DISTRO="${img_distro}" \
DEBUG="${DEBUG:-}" \ DEBUG="${DEBUG:-}" \
USE_DOCKER="1" \
AGENT_VERSION="${agent_version}" \ AGENT_VERSION="${agent_version}" \
IMG_OS_VERSION="${img_os_version}" \ IMG_OS_VERSION="${img_os_version}" \
DISTRO_ROOTFS="${tmp_dir}/rootfs-image" DISTRO_ROOTFS="${tmp_dir}/rootfs-image"

2
obs-packaging/kata-containers-image/update.sh
View File

@@ -48,7 +48,7 @@ replace_list=(
verify verify
rm -rf kata-containers.tar.gz rm -rf kata-containers.tar.gz
image_tarball=$(find . -name 'kata-containers-'"${VERSION}"'-*.tar.gz') image_tarball=$(find . -name 'kata-containers-'"${VERSION}"'-'"${kata_agent_hash:0:11}"'-*.tar.gz')
[ -f "${image_tarball}" ] || die "image not found" [ -f "${image_tarball}" ] || die "image not found"
cp "${image_tarball}" kata-containers.tar.gz cp "${image_tarball}" kata-containers.tar.gz

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

@@ -17,6 +17,8 @@ readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
readonly project="kata-containers" readonly project="kata-containers"
GOPATH=${GOPATH:-${HOME}/go} GOPATH=${GOPATH:-${HOME}/go}
source "${script_dir}/../scripts/lib.sh"
die() { die() {
msg="$*" msg="$*"
echo "ERROR: ${FUNCNAME[1]} ${msg}" >&2 echo "ERROR: ${FUNCNAME[1]} ${msg}" >&2
@@ -56,9 +58,12 @@ main() {
kata_version=${1:-} kata_version=${1:-}
[ -n "${kata_version}" ] || usage "1" [ -n "${kata_version}" ] || usage "1"
image_tarball=$(find -name 'kata-containers-*.tar.gz' | grep "${kata_version}") || agent_sha=$(get_kata_hash_from_tag "agent" "${kata_version}")
# tarball only has 11 chars from agent sha
agent_sha=${agent_sha:0:11}
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}" "${script_dir}/../obs-packaging/kata-containers-image/build_image.sh" -v "${kata_version}"
image_tarball=$(find -name 'kata-containers-*.tar.gz' | grep "${kata_version}") || die "file not found ${image_tarball}" image_tarball=$(find -name 'kata-containers-*.tar.gz' | grep "${kata_version}" | grep "${agent_sha}" ) || die "file not found ${image_tarball}"
if [ ${push} == "true" ]; then if [ ${push} == "true" ]; then
hub -C "${GOPATH}/src/github.com/${project}/agent" release edit -a "${image_tarball}" "${kata_version}" hub -C "${GOPATH}/src/github.com/${project}/agent" release edit -a "${image_tarball}" "${kata_version}"

5
scripts/lib.sh
View File

@@ -82,3 +82,8 @@ build_hub() {
./script/build -o "${hub_bin}" ./script/build -o "${hub_bin}"
popd >>/dev/null popd >>/dev/null
} }
get_kata_hash_from_tag() {
repo=$1
git ls-remote --tags "https://github.com/${project}/${repo}.git" | grep "refs/tags/${kata_version}^{}" | awk '{print $1}'
}