Disable the test-owners verify step until the merge conflicts are resolved.

Fixes #35850. GitHub's merging doesn't support .gitattributes-- I verified this with support. There may be a workaround with line padding or making the bot do merges on its own, which is beneficial for custom merge conflict resolution in general.

Disable the test-owners verify step until the merge conflicts are resolved.
57a152ca · Ryan Hitchman · 7747f5ee · 57a152ca
Commit 57a152ca authored Nov 02, 2016 by Ryan Hitchman
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

verify-test-owners.sh hack/verify-test-owners.sh +2 -0

No files found.
--- a/hack/verify-test-owners.sh
+++ b/hack/verify-test-owners.sh
@@ -20,8 +20,10 @@ set -o pipefail
 export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"

+
 cd "${KUBE_ROOT}"
 if ! hack/update_owners.py --check; then
    echo 'Run ./hack/update_owners.py to fix it'
+    exit  # TODO(rmmh): fix Github merging to respect .gitattributes
    exit 1
 fi