Add skcms back to status and datahopper
Bug: skia:8777
Change-Id: I0ebc88f64f68ee0f9f9750535fea74cbc47607bf
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/195102
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/datahopper/go/datahopper/main.go b/datahopper/go/datahopper/main.go
index 4ab8bb7..ee0d04d 100644
--- a/datahopper/go/datahopper/main.go
+++ b/datahopper/go/datahopper/main.go
@@ -45,6 +45,7 @@
firestoreInstance = flag.String("firestore_instance", "", "Firestore instance to use, eg. \"production\"")
local = flag.Bool("local", false, "Running locally if true. As opposed to in production.")
promPort = flag.String("prom_port", ":20000", "Metrics service address (e.g., ':10110')")
+ repoUrls = common.NewMultiStringFlag("repo", nil, "Repositories to query for status.")
workdir = flag.String("workdir", ".", "Working directory used by data processors.")
perfBucket = flag.String("perf_bucket", "skia-perf", "The GCS bucket that should be used for writing into perf")
@@ -112,12 +113,14 @@
tnp := taskname.DefaultTaskNameParser()
// Shared repo objects.
+ if *repoUrls == nil {
+ sklog.Fatal("At least one --repo is required.")
+ }
reposDir := path.Join(w, "repos")
if err := os.MkdirAll(reposDir, os.ModePerm); err != nil {
sklog.Fatal(err)
}
- // TODO(borenet): We should include all (public and private) repos.
- repos, err := repograph.NewMap(ctx, []string{common.REPO_SKIA, common.REPO_SKIA_INFRA, common.REPO_LOTTIE_CI}, reposDir)
+ repos, err := repograph.NewMap(ctx, *repoUrls, reposDir)
if err != nil {
sklog.Fatal(err)
}
diff --git a/datahopper/sys/datahopperd.service b/datahopper/sys/datahopperd.service
index 71717f3..cd52058 100644
--- a/datahopper/sys/datahopperd.service
+++ b/datahopper/sys/datahopperd.service
@@ -10,6 +10,10 @@
--bigtable_instance=production \
--firestore_instance=production \
--pubsub_topic_set=production \
+ --repo=https://skia.googlesource.com/skia.git \
+ --repo=https://skia.googlesource.com/buildbot.git \
+ --repo=https://skia.googlesource.com/lottie-ci.git \
+ --repo=https://skia.googlesource.com/skcms.git \
--workdir=/mnt/pd0/datahopper_workdir \
Restart=always
User=default
diff --git a/status/sys/statusd.service b/status/sys/statusd.service
index 1cd2baf..3471778 100644
--- a/status/sys/statusd.service
+++ b/status/sys/statusd.service
@@ -17,7 +17,8 @@
--pubsub_topic_set=production \
--repo=https://skia.googlesource.com/skia.git \
--repo=https://skia.googlesource.com/buildbot.git \
- --repo=https://skia.googlesource.com/lottie-ci.git
+ --repo=https://skia.googlesource.com/lottie-ci.git \
+ --repo=https://skia.googlesource.com/skcms.git
Restart=always
User=default
Group=default