Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase build verbosity for verify-generated-{protobuf,runtime}.sh #34745

Merged
merged 1 commit into from
Oct 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions build/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -331,15 +331,15 @@ function kube::build::docker_delete_old_images() {
# docker images "$1" --format "{{.Tag}}"
for tag in $("${DOCKER[@]}" images ${1} | tail -n +2 | awk '{print $2}') ; do
if [[ "${tag}" != "${2}"* ]] ; then
V=6 kube::log::status "Keeping image ${1}:${tag}"
V=3 kube::log::status "Keeping image ${1}:${tag}"
continue
fi

if [[ -z "${3:-}" || "${tag}" != "${3}" ]] ; then
V=2 kube::log::status "Deleting image ${1}:${tag}"
"${DOCKER[@]}" rmi "${1}:${tag}" >/dev/null
else
V=6 kube::log::status "Keeping image ${1}:${tag}"
V=3 kube::log::status "Keeping image ${1}:${tag}"
fi
done
}
Expand All @@ -353,14 +353,14 @@ function kube::build::docker_delete_old_containers() {
# docker ps -a --format="{{.Names}}"
for container in $("${DOCKER[@]}" ps -a | tail -n +2 | awk '{print $NF}') ; do
if [[ "${container}" != "${1}"* ]] ; then
V=6 kube::log::status "Keeping container ${container}"
V=3 kube::log::status "Keeping container ${container}"
continue
fi
if [[ -z "${2:-}" || "${container}" != "${2}" ]] ; then
V=2 kube::log::status "Deleting container ${container}"
kube::build::destroy_container "${container}"
else
V=6 kube::log::status "Keeping container ${container}"
V=3 kube::log::status "Keeping container ${container}"
fi
done
}
Expand Down Expand Up @@ -613,7 +613,7 @@ function kube::build::rsync_probe {
# rsync daemon can be reached out.
function kube::build::start_rsyncd_container() {
kube::build::stop_rsyncd_container
V=6 kube::log::status "Starting rsyncd container"
V=3 kube::log::status "Starting rsyncd container"
kube::build::run_build_command_ex \
"${KUBE_RSYNC_CONTAINER_NAME}" -p 127.0.0.1:${KUBE_RSYNC_PORT}:${KUBE_CONTAINER_RSYNC_PORT} -d \
-- /rsyncd.sh >/dev/null
Expand Down Expand Up @@ -645,7 +645,7 @@ function kube::build::start_rsyncd_container() {
}

function kube::build::stop_rsyncd_container() {
V=6 kube::log::status "Stopping any currently running rsyncd container"
V=3 kube::log::status "Stopping any currently running rsyncd container"
unset KUBE_RSYNC_ADDR
kube::build::destroy_container "${KUBE_RSYNC_CONTAINER_NAME}"
}
Expand All @@ -666,7 +666,7 @@ function kube::build::sync_to_container() {
# output only directories and things that are not necessary like the git
# directory. The '- /' filter prevents rsync from trying to set the
# uid/gid/perms on the root of the sync tree.
V=6 kube::log::status "Running rsync"
V=3 kube::log::status "Running rsync"
rsync ${rsync_extra} \
--archive \
--delete \
Expand Down Expand Up @@ -701,7 +701,7 @@ function kube::build::copy_output() {
#
# We are looking to copy out all of the built binaries along with various
# generated files.
V=6 kube::log::status "Running rsync"
V=3 kube::log::status "Running rsync"
rsync ${rsync_extra} \
--archive \
--prune-empty-dirs \
Expand Down
2 changes: 1 addition & 1 deletion hack/verify-generated-protobuf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ for APIROOT in ${APIROOTS}; do
cp -a -T "${KUBE_ROOT}/${APIROOT}" "${_tmp}/${APIROOT}"
done

"${KUBE_ROOT}/hack/update-generated-protobuf.sh"
KUBE_VERBOSE=3 "${KUBE_ROOT}/hack/update-generated-protobuf.sh"
for APIROOT in ${APIROOTS}; do
TMP_APIROOT="${_tmp}/${APIROOT}"
echo "diffing ${APIROOT} against freshly generated protobuf"
Expand Down
2 changes: 1 addition & 1 deletion hack/verify-generated-runtime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ mkdir -p ${KUBE_REMOTE_RUNTIME_ROOT}/_tmp
cp ${KUBE_REMOTE_RUNTIME_ROOT}/api.pb.go ${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/

ret=0
hack/update-generated-runtime.sh
KUBE_VERBOSE=3 "${KUBE_ROOT}/hack/update-generated-runtime.sh"
diff -I "gzipped FileDescriptorProto" -I "0x" -Naupr ${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/api.pb.go ${KUBE_REMOTE_RUNTIME_ROOT}/api.pb.go || ret=$?
if [[ $ret -eq 0 ]]; then
echo "Generated container runtime api is up to date."
Expand Down