Update verify scripts to clean up even on failures

This commit is contained in:
Jeff Grafton 2016-06-15 18:42:31 -07:00 committed by Mike Danese
parent 3ba5816e46
commit e880dbfd25
4 changed files with 10 additions and 4 deletions

View File

@ -29,6 +29,7 @@ API_REFERENCE_DOCS_ROOT="${KUBE_ROOT}/docs/api-reference"
OUTPUT_DIR="${KUBE_ROOT}/_tmp/api-reference"
mkdir -p ${OUTPUT_DIR}
TMP_ROOT="${KUBE_ROOT}/_tmp"
trap "rm -rf ${TMP_ROOT}" EXIT SIGINT
# Generate API reference docs in tmp.
"./hack/update-api-reference-docs.sh" "${OUTPUT_DIR}"
@ -36,7 +37,6 @@ TMP_ROOT="${KUBE_ROOT}/_tmp"
echo "diffing ${API_REFERENCE_DOCS_ROOT} against freshly generated docs"
ret=0
diff -NauprB -I 'Last update' --exclude=*.md "${API_REFERENCE_DOCS_ROOT}" "${OUTPUT_DIR}" || ret=$?
rm -rf "${TMP_ROOT}"
if [[ $ret -eq 0 ]]
then
echo "${API_REFERENCE_DOCS_ROOT} up to date."

View File

@ -35,6 +35,13 @@ generated_files=($(
\) -prune \
\) -name '*.generated.go'))
function cleanup {
for generated_file in ${generated_files[@]}; do
rm -f "${generated_file}.original"
done
}
trap cleanup EXIT SIGINT
for generated_file in ${generated_files[@]}; do
cat "${generated_file}" > "${generated_file}.original"
done
@ -53,7 +60,6 @@ for generated_file in ${generated_files[@]}; do
ret=1
fi
rm -f "${generated_file}.original"
done
exit $ret

View File

@ -43,6 +43,7 @@ TMP_DIFFROOT="${KUBE_ROOT}/_tmp/pkg"
_tmp="${KUBE_ROOT}/_tmp"
mkdir -p "${_tmp}"
trap "rm -rf ${_tmp}" EXIT SIGINT
cp -a "${DIFFROOT}" "${TMP_DIFFROOT}"
"${KUBE_ROOT}/hack/update-generated-swagger-docs.sh"
@ -50,7 +51,6 @@ echo "diffing ${DIFFROOT} against freshly generated swagger type documentation"
ret=0
diff -Naupr -I 'Auto generated by' "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?
cp -a "${TMP_DIFFROOT}" "${KUBE_ROOT}/"
rm -rf "${_tmp}"
if [[ $ret -eq 0 ]]
then
echo "${DIFFROOT} up to date."

View File

@ -32,6 +32,7 @@ TMP_SPECROOT="${KUBE_ROOT}/_tmp/swagger-spec"
_tmp="${KUBE_ROOT}/_tmp"
mkdir -p "${_tmp}"
trap "rm -rf ${_tmp}" EXIT SIGINT
cp -a "${SPECROOT}" "${TMP_SPECROOT}"
"${KUBE_ROOT}/hack/update-swagger-spec.sh"
@ -39,7 +40,6 @@ echo "diffing ${SPECROOT} against freshly generated swagger spec"
ret=0
diff -Naupr -I 'Auto generated by' "${SPECROOT}" "${TMP_SPECROOT}" || ret=$?
cp -a ${TMP_SPECROOT} "${KUBE_ROOT}/api"
rm -rf "${_tmp}"
if [[ $ret -eq 0 ]]
then
echo "${SPECROOT} up to date."