Skip to content

hack: clean up verify scripts #1771

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.

Sign up for GitHub

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

Merged
k8s-ci-robot merged 1 commit into from
Mar 9, 2021
Merged

hack: clean up verify scripts #1771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hack/verify-yamllint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
6 changes: 3 additions & 3 deletions hack/verify.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down