From a95814b593254225cc8c51f39b1755980ce8183b Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Thu, 2 Jul 2015 14:03:02 -0700 Subject: [PATCH] make swagger presubmit not spew noise --- hack/lib/etcd.sh | 4 ++-- hack/update-swagger-spec.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index f0ab3bc1fa0bf..581b9265baaa2 100644 --- a/hack/lib/etcd.sh +++ b/hack/lib/etcd.sh @@ -40,13 +40,13 @@ kube::etcd::start() { # Start etcd ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX) - kube::log::usage "etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null" + kube::log::info "etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null" etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null & ETCD_PID=$! echo "Waiting for etcd to come up." kube::util::wait_for_url "http://${host}:${port}/v2/machines" "etcd: " 0.25 80 - curl -X PUT "http://${host}:${port}/v2/keys/_test" + curl -fs -X PUT "http://${host}:${port}/v2/keys/_test" } kube::etcd::stop() { diff --git a/hack/update-swagger-spec.sh b/hack/update-swagger-spec.sh index e85abd4b5953d..edc22c1afea7f 100755 --- a/hack/update-swagger-spec.sh +++ b/hack/update-swagger-spec.sh @@ -54,17 +54,17 @@ KUBE_API_VERSIONS="v1,v1beta3" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \ --public_address_override="127.0.0.1" \ --kubelet_port=${KUBELET_PORT} \ --runtime_config=api/v1beta3 \ - --service-cluster-ip-range="10.0.0.0/24" 1>&2 & + --service-cluster-ip-range="10.0.0.0/24" >/dev/null 2>&1 & APISERVER_PID=$! kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver: " SWAGGER_API_PATH="http://127.0.0.1:${API_PORT}/swaggerapi/" kube::log::status "Updating " ${SWAGGER_ROOT_DIR} -curl ${SWAGGER_API_PATH} > ${SWAGGER_ROOT_DIR}/resourceListing.json -curl ${SWAGGER_API_PATH}version > ${SWAGGER_ROOT_DIR}/version.json -curl ${SWAGGER_API_PATH}api > ${SWAGGER_ROOT_DIR}/api.json -curl ${SWAGGER_API_PATH}api/v1beta3 > ${SWAGGER_ROOT_DIR}/v1beta3.json -curl ${SWAGGER_API_PATH}api/v1 > ${SWAGGER_ROOT_DIR}/v1.json +curl -fs ${SWAGGER_API_PATH} > ${SWAGGER_ROOT_DIR}/resourceListing.json +curl -fs ${SWAGGER_API_PATH}version > ${SWAGGER_ROOT_DIR}/version.json +curl -fs ${SWAGGER_API_PATH}api > ${SWAGGER_ROOT_DIR}/api.json +curl -fs ${SWAGGER_API_PATH}api/v1beta3 > ${SWAGGER_ROOT_DIR}/v1beta3.json +curl -fs ${SWAGGER_API_PATH}api/v1 > ${SWAGGER_ROOT_DIR}/v1.json kube::log::status "SUCCESS"