From 97e669abdf70f8564f92f1637e3eea8cdd030bf7 Mon Sep 17 00:00:00 2001
From: Matt Liggett <mml@google.com>
Date: Fri, 10 Nov 2017 10:54:23 -0800
Subject: [PATCH 1/3] Disallow parent approvals.

---
 test/conformance/testdata/OWNERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/conformance/testdata/OWNERS b/test/conformance/testdata/OWNERS
index ff12a8f5450..309935c356e 100644
--- a/test/conformance/testdata/OWNERS
+++ b/test/conformance/testdata/OWNERS
@@ -1,6 +1,8 @@
 # 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

From 13f3844ef5c3489803411632855e0a7208762ce7 Mon Sep 17 00:00:00 2001
From: Matt Liggett <mml@google.com>
Date: Fri, 10 Nov 2017 11:02:11 -0800
Subject: [PATCH 2/3] Add README.md to test/conformance.

---
 test/conformance/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 test/conformance/README.md

diff --git a/test/conformance/README.md b/test/conformance/README.md
new file mode 100644
index 00000000000..e086b892800
--- /dev/null
+++ b/test/conformance/README.md
@@ -0,0 +1,15 @@
+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.

From 3483447ebcf06b34a2c484bbaa8b54d2f78cf544 Mon Sep 17 00:00:00 2001
From: Matt Liggett <mml@google.com>
Date: Fri, 10 Nov 2017 11:04:55 -0800
Subject: [PATCH 3/3] Refer to instructions when the test fails.

---
 test/conformance/conformance_test.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/conformance/conformance_test.sh b/test/conformance/conformance_test.sh
index b0e5eb1cd86..04113c09b6e 100755
--- 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