github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6472 from zmerlynn/fix_build_status 

Add kube::util::wait-for-jobs to report status, unlike builtin wait
pull/6/head
Rohit Jnagal 2015-04-06 13:39:58 -07:00
parent ecee4b16a1 2bc5dd559a
commit 8b4914dd0f
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/common.sh
View File

@ -508,11 +508,11 @@ function kube::release::package_tarballs() {
kube::release::package_client_tarballs & kube::release::package_client_tarballs &
kube::release::package_server_tarballs & kube::release::package_server_tarballs &
kube::release::package_salt_tarball & kube::release::package_salt_tarball &
wait || { kube::log::error "previous tarball phase failed"; return 1; } kube::util::wait-for-jobs || { kube::log::error "previous tarball phase failed"; return 1; }
kube::release::package_full_tarball & # _full depends on all the previous phases kube::release::package_full_tarball & # _full depends on all the previous phases
kube::release::package_test_tarball & # _test doesn't depend on anything kube::release::package_test_tarball & # _test doesn't depend on anything
wait || { kube::log::error "previous tarball phase failed"; return 1; } kube::util::wait-for-jobs || { kube::log::error "previous tarball phase failed"; return 1; }
} }
# Package up all of the cross compiled clients. Over time this should grow into # Package up all of the cross compiled clients. Over time this should grow into
@ -549,7 +549,7 @@ function kube::release::package_client_tarballs() {
done done
kube::log::status "Waiting on tarballs" kube::log::status "Waiting on tarballs"
wait || { kube::log::error "client tarball creation failed"; exit 1; } kube::util::wait-for-jobs || { kube::log::error "client tarball creation failed"; exit 1; }
} }
# Package up all of the server binaries # Package up all of the server binaries
@ -625,7 +625,7 @@ function kube::release::create_docker_images_for_server() {
) & ) &
done done
wait || { kube::log::error "previous Docker build failed"; return 1; } kube::util::wait-for-jobs || { kube::log::error "previous Docker build failed"; return 1; }
kube::log::status "Docker builds done" kube::log::status "Docker builds done"
) )
} }

11
hack/lib/util.sh
View File

@ -95,3 +95,14 @@ kube::util::host_platform() {
esac esac
echo "${host_os}/${host_arch}" echo "${host_os}/${host_arch}"
} }
# Wait for background jobs to finish. Return with
# an error status if any of the jobs failed.
kube::util::wait-for-jobs() {
local fail=0
local job
for job in $(jobs -p); do
wait "${job}" || fail=$((fail + 1))
done
return ${fail}
}