From ac18c8aee350f38ffbd8963ead0b5bed1157c804 Mon Sep 17 00:00:00 2001 From: Nikhita Raghunath Date: Tue, 9 Mar 2021 17:19:03 +0530 Subject: [PATCH] hack: clean up verify scripts --- hack/verify-yamllint.sh | 1 + hack/verify.sh | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hack/verify-yamllint.sh b/hack/verify-yamllint.sh index e18c636f69b..350ca5bacad 100755 --- a/hack/verify-yamllint.sh +++ b/hack/verify-yamllint.sh @@ -36,6 +36,7 @@ if [ $# != 0 ]; then exit 1 fi +# we assume that pip3 is already installed if ! command -v yamllint >/dev/null 2>&1; then echo "yamllint not found - installing with: ${pip} install -r ${pip_requirements}" ${pip} install -r ${pip_requirements} diff --git a/hack/verify.sh b/hack/verify.sh index b8a43f0602a..409d5280354 100755 --- a/hack/verify.sh +++ b/hack/verify.sh @@ -18,7 +18,7 @@ set -o errexit set -o nounset set -o pipefail -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. # Some useful colors. if [[ -z "${color_start-}" ]]; then @@ -34,7 +34,7 @@ EXCLUDED_PATTERNS=( "verify-*-dockerized.sh" # Don't run any scripts that intended to be run dockerized ) -EXCLUDED_CHECKS=$(ls ${EXCLUDED_PATTERNS[@]/#/${KUBE_ROOT}\/hack\/} 2>/dev/null || true) +EXCLUDED_CHECKS=$(ls ${EXCLUDED_PATTERNS[@]/#/${REPO_ROOT}\/hack\/} 2>/dev/null || true) function is-excluded { for e in ${EXCLUDED_CHECKS[@]}; do @@ -110,7 +110,7 @@ if ${SILENT} ; then fi ret=0 -run-checks "${KUBE_ROOT}/hack/verify-*.sh" bash +run-checks "${REPO_ROOT}/hack/verify-*.sh" bash if [[ ${ret} -eq 1 ]]; then print-failed-tests