Move buckets.yaml into kettle.

BUILD.bazel

@@ -17,12 +17,6 @@ filegroup(
     visibility = ["//visibility:private"],
 )
 
-filegroup(
-    name = "buckets",
-    srcs = ["buckets.yaml"],
-    visibility = ["//:__subpackages__"],
-)
-
 workspace_binary(
     name = "dep",
     cmd = "//vendor/github.com/golang/dep/cmd/dep",

docs/contributing-test-results.md

@@ -15,7 +15,7 @@ The process is as follows:
   - Unfortunately this part is currently left as an exercise to the reader. We use
     [bootstrap](/jenkins/bootstrap.py) to facilitate this and are in the midst of
     rewriting it to better support external usage.
-- Add the GCS bucket info to [buckets.yaml](/buckets.yaml) via a PR (use the
+- Add the GCS bucket info to [buckets.yaml](/kettle/buckets.yaml) via a PR (use the
   previously designated github handle for the `contact` field)
 - Add jobs and dashboards to the [testgrid config](/testgrid/config.yaml) via
   a PR (use the previously designated point of contact info in a comment next to

docs/tests/node-e2e-ci.md

@@ -158,7 +158,7 @@ Official description of the individual files and their content is described by [
 ## Publishing test results in the TestGrid
 
 To have the [TestGrid](https://k8s-testgrid.appspot.com/) consume the new build results, one needs to extend the TestGrid
-configuration file at https://github.com/kubernetes/test-infra/blob/master/testgrid/config/config.yaml and a list of GCS buckets at https://github.com/kubernetes/test-infra/blob/master/buckets.yaml.
+configuration file at https://github.com/kubernetes/test-infra/blob/master/testgrid/config/config.yaml and a list of GCS buckets at https://github.com/kubernetes/test-infra/blob/master/kettle/buckets.yaml.
 
 The header of the file describes what needs to be done to add new build.
 The current jobs have been added through https://github.com/kubernetes/test-infra/pull/5693 PR.

kettle/BUILD.bazel

@@ -68,7 +68,7 @@ py_test(
         "model.py",
         ":package-srcs",
     ],
-    data = ["//:buckets"],
+    data = [":buckets"],
     # idem
     local = True,
     deps = ["@yaml"],
@@ -92,3 +92,9 @@ filegroup(
     tags = ["automanaged"],
     visibility = ["//visibility:public"],
 )
+
+filegroup(
+    name = "buckets",
+    srcs = ["buckets.yaml"],
+    visibility = ["//:__subpackages__"],
+)

kettle/Makefile

@@ -24,9 +24,7 @@ get-cluster-credentials:
 	kubectl config use-context gke_k8s-gubernator_us-west1-b_g8r || gcloud container clusters get-credentials "$(CLUSTER)" --project="$(PROJECT)" --zone="$(ZONE)"
 
 build:
-	cp ../buckets.yaml .
 	docker build -t $(IMG):$(TAG) .
-	rm buckets.yaml
 	docker tag $(IMG):$(TAG) $(IMG):latest
 	echo Built $(IMG):$(TAG) and tagged with $(IMG):latest ;
 

kettle/make_json.py

@@ -81,7 +81,7 @@ def make_result(name, time, failure_text):
 
 # pypy compatibility hack
 BUCKETS = json.loads(subprocess.check_output(
-    ['python2', '-c', 'import json,yaml; print json.dumps(yaml.load(open("../buckets.yaml")))'],
+    ['python2', '-c', 'import json,yaml; print json.dumps(yaml.load(open("buckets.yaml")))'],
     cwd=os.path.dirname(os.path.abspath(__file__))))
 
 

kettle/update.py

@@ -26,7 +26,7 @@ def call(cmd):
 
 
 def main():
-    call('time python make_db.py --buckets ../buckets.yaml --junit --threads 32')
+    call('time python make_db.py --buckets buckets.yaml --junit --threads 32')
 
     bq_cmd = 'bq load --source_format=NEWLINE_DELIMITED_JSON --max_bad_records=1000'
     mj_cmd = 'pypy make_json.py'