Merge pull request #55503 from mml/conformance

Automatic merge from submit-queue (batch tested with PRs 52461, 55503). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. A few improvements to the conformance regtesst - Set OWNERS files to disallow parent approvers (doesn't work yet, but should be live next week.) - Document how to fix failing test. - Add a better error message. ```release-note NONE ```

Merge pull request #55503 from mml/conformance
858f3cbf · Kubernetes Submit Queue · GitHub · 589b1b10 · 3483447e · 858f3cbf
Unverified Commit 858f3cbf authored Nov 11, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 11, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 2 deletions

README.md test/conformance/README.md +15 -0

conformance_test.sh test/conformance/conformance_test.sh +6 -2

OWNERS test/conformance/testdata/OWNERS +2 -0

No files found.
--- a/test/conformance/README.md
+++ b/test/conformance/README.md
+This directory contains the regression test for controlling the list of all
+conformance tests.
+
+If you add or remove a conformance test, this test will fail and you will need
+to update the golden list of tests stored in `testdata/`.  Changes to that file
+require review by sig-architecture.
+
+To update the list, run
+
+```console
+$ bazel build //test/conformance:list_conformance_tests
+$ cp bazel-genfiles/test/conformance/conformance.txt test/conformance/testdata
+```
+
+Add the changed file to your PR, then send for review.
--- a/test/conformance/conformance_test.sh
+++ b/test/conformance/conformance_test.sh
@@ -21,5 +21,9 @@

 set -o errexit

-diff -u test/conformance/testdata/conformance.txt test/conformance/conformance.txt
-echo PASS
+if diff -u test/conformance/testdata/conformance.txt test/conformance/conformance.txt; then
+  echo PASS
+  exit 0
+fi
+echo 'See instructions in test/conformance/README.md'
+exit 1
--- a/test/conformance/testdata/OWNERS
+++ b/test/conformance/testdata/OWNERS
 # To be owned by sig-architecture.
 # TODO(mml): Exclude parent owners once
 # https://github.com/kubernetes/test-infra/issues/5197 is implemented.
+options:
+  - no_parent_owners: true
 reviewers:
  - bgrant0607
  - smarterclayton