Skip to content

Commit

Permalink
packaging: make kata-deploy work for 2.0
Browse files Browse the repository at this point in the history
We no longer need to deploy multiple repositories.

Signed-off-by: Peng Tao <[email protected]>
  • Loading branch information
bergwolf committed Aug 31, 2020
1 parent 86a6e0b commit aa3fb4d
Showing 1 changed file with 14 additions and 24 deletions.
38 changes: 14 additions & 24 deletions tools/packaging/release/kata-deploy-binaries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ readonly script_name="$(basename "${BASH_SOURCE[0]}")"
readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
readonly project="kata-containers"
readonly prefix="/opt/kata"
readonly project_to_attach="github.com/${project}/runtime"
readonly project_to_attach="github.com/${project}/${project}"
readonly tmp_dir=$(mktemp -d -t static-build-tmp.XXXXXXXXXX)
readonly GOPATH="${tmp_dir}/go"
# flag to decide if push tarball to github
Expand All @@ -32,12 +32,6 @@ exit_handler() {
}
trap exit_handler EXIT

projects=(
proxy
runtime
shim
)

die() {
msg="$*"
echo "ERROR: ${msg}" >&2
Expand Down Expand Up @@ -201,22 +195,18 @@ install_docker_config_script() {
#Install all components that are not assets
install_kata_components() {
kata_version=${1:-$kata_version}
for p in "${projects[@]}"; do
echo "Download ${p}"
go get "github.com/${project}/$p" || true
pushd "${GOPATH}/src/github.com/${project}/$p" >>/dev/null
echo "Checkout to version ${kata_version}"
git checkout "${kata_version}"
echo "Build"
make \
PREFIX="${prefix}" \
QEMUCMD="qemu-system-x86_64"
echo "Install"
make PREFIX="${prefix}" \
DESTDIR="${destdir}" \
install
popd >>/dev/null
done
pushd "${script_dir}/../../../"
echo "Checkout to version ${kata_version}"
git checkout "${kata_version}"
echo "Build"
make \
PREFIX="${prefix}" \
QEMUCMD="qemu-system-x86_64"
echo "Install"
make PREFIX="${prefix}" \
DESTDIR="${destdir}" \
install
popd
sed -i -e '/^initrd =/d' "${destdir}/${prefix}/share/defaults/${project}/configuration-qemu.toml"
sed -i -e '/^initrd =/d' "${destdir}/${prefix}/share/defaults/${project}/configuration-fc.toml"
pushd "${destdir}/${prefix}/share/defaults/${project}"
Expand Down Expand Up @@ -300,7 +290,7 @@ main() {
tar cfJ "${tarball_name}" "./opt"
popd >>/dev/null
if [ "${push}" == "true" ]; then
hub -C "${GOPATH}/src/github.com/${project}/runtime" release edit -a "${tarball_name}" "${kata_version}"
hub -C "${GOPATH}/src/github.com/${project}/${project}" release edit -a "${tarball_name}" "${kata_version}"
else
echo "Wont push the tarball to github use -p option to do it."
fi
Expand Down

0 comments on commit aa3fb4d

Please sign in to comment.