[milo] job_source -> build_source.
One last rename...
R=estaab@chromium.org, hinoka@chromium.org
BUG=735098
Review-Url: https://codereview.chromium.org/2948143003
diff --git a/milo/job_source/buildbot/build.go b/milo/build_source/buildbot/build.go
similarity index 100%
rename from milo/job_source/buildbot/build.go
rename to milo/build_source/buildbot/build.go
diff --git a/milo/job_source/buildbot/build_test.go b/milo/build_source/buildbot/build_test.go
similarity index 100%
rename from milo/job_source/buildbot/build_test.go
rename to milo/build_source/buildbot/build_test.go
diff --git a/milo/job_source/buildbot/builder.go b/milo/build_source/buildbot/builder.go
similarity index 100%
rename from milo/job_source/buildbot/builder.go
rename to milo/build_source/buildbot/builder.go
diff --git a/milo/job_source/buildbot/builder_test.go b/milo/build_source/buildbot/builder_test.go
similarity index 100%
rename from milo/job_source/buildbot/builder_test.go
rename to milo/build_source/buildbot/builder_test.go
diff --git a/milo/job_source/buildbot/buildinfo.go b/milo/build_source/buildbot/buildinfo.go
similarity index 99%
rename from milo/job_source/buildbot/buildinfo.go
rename to milo/build_source/buildbot/buildinfo.go
index 2d241e3..6c2c2f3 100644
--- a/milo/job_source/buildbot/buildinfo.go
+++ b/milo/build_source/buildbot/buildinfo.go
@@ -18,7 +18,7 @@
"github.com/luci/luci-go/logdog/common/types"
"github.com/luci/luci-go/luci_config/common/cfgtypes"
milo "github.com/luci/luci-go/milo/api/proto"
- "github.com/luci/luci-go/milo/job_source/raw_presentation"
+ "github.com/luci/luci-go/milo/build_source/raw_presentation"
"google.golang.org/grpc/codes"
diff --git a/milo/job_source/buildbot/buildinfo_test.go b/milo/build_source/buildbot/buildinfo_test.go
similarity index 100%
rename from milo/job_source/buildbot/buildinfo_test.go
rename to milo/build_source/buildbot/buildinfo_test.go
diff --git a/milo/job_source/buildbot/console.go b/milo/build_source/buildbot/console.go
similarity index 100%
rename from milo/job_source/buildbot/console.go
rename to milo/build_source/buildbot/console.go
diff --git a/milo/job_source/buildbot/console_test.go b/milo/build_source/buildbot/console_test.go
similarity index 100%
rename from milo/job_source/buildbot/console_test.go
rename to milo/build_source/buildbot/console_test.go
diff --git a/milo/job_source/buildbot/datastore.go b/milo/build_source/buildbot/datastore.go
similarity index 100%
rename from milo/job_source/buildbot/datastore.go
rename to milo/build_source/buildbot/datastore.go
diff --git a/milo/job_source/buildbot/expectations/CrWinGoma.30608.build.json b/milo/build_source/buildbot/expectations/CrWinGoma.30608.build.json
similarity index 100%
rename from milo/job_source/buildbot/expectations/CrWinGoma.30608.build.json
rename to milo/build_source/buildbot/expectations/CrWinGoma.30608.build.json
diff --git a/milo/job_source/buildbot/expectations/chromium_presubmit.426944.build.json b/milo/build_source/buildbot/expectations/chromium_presubmit.426944.build.json
similarity index 100%
rename from milo/job_source/buildbot/expectations/chromium_presubmit.426944.build.json
rename to milo/build_source/buildbot/expectations/chromium_presubmit.426944.build.json
diff --git a/milo/job_source/buildbot/expectations/gerritCL.1234.build.json b/milo/build_source/buildbot/expectations/gerritCL.1234.build.json
similarity index 100%
rename from milo/job_source/buildbot/expectations/gerritCL.1234.build.json
rename to milo/build_source/buildbot/expectations/gerritCL.1234.build.json
diff --git a/milo/job_source/buildbot/expectations/newline.1234.build.json b/milo/build_source/buildbot/expectations/newline.1234.build.json
similarity index 100%
rename from milo/job_source/buildbot/expectations/newline.1234.build.json
rename to milo/build_source/buildbot/expectations/newline.1234.build.json
diff --git a/milo/job_source/buildbot/expectations/win_chromium_rel_ng.246309.build.json b/milo/build_source/buildbot/expectations/win_chromium_rel_ng.246309.build.json
similarity index 100%
rename from milo/job_source/buildbot/expectations/win_chromium_rel_ng.246309.build.json
rename to milo/build_source/buildbot/expectations/win_chromium_rel_ng.246309.build.json
diff --git a/milo/job_source/buildbot/grpc.go b/milo/build_source/buildbot/grpc.go
similarity index 100%
rename from milo/job_source/buildbot/grpc.go
rename to milo/build_source/buildbot/grpc.go
diff --git a/milo/job_source/buildbot/grpc_test.go b/milo/build_source/buildbot/grpc_test.go
similarity index 100%
rename from milo/job_source/buildbot/grpc_test.go
rename to milo/build_source/buildbot/grpc_test.go
diff --git a/milo/job_source/buildbot/html.go b/milo/build_source/buildbot/html.go
similarity index 100%
rename from milo/job_source/buildbot/html.go
rename to milo/build_source/buildbot/html.go
diff --git a/milo/job_source/buildbot/html_data.go b/milo/build_source/buildbot/html_data.go
similarity index 100%
rename from milo/job_source/buildbot/html_data.go
rename to milo/build_source/buildbot/html_data.go
diff --git a/milo/job_source/buildbot/html_test.go b/milo/build_source/buildbot/html_test.go
similarity index 100%
rename from milo/job_source/buildbot/html_test.go
rename to milo/build_source/buildbot/html_test.go
diff --git a/milo/job_source/buildbot/master.go b/milo/build_source/buildbot/master.go
similarity index 100%
rename from milo/job_source/buildbot/master.go
rename to milo/build_source/buildbot/master.go
diff --git a/milo/job_source/buildbot/master_test.go b/milo/build_source/buildbot/master_test.go
similarity index 100%
rename from milo/job_source/buildbot/master_test.go
rename to milo/build_source/buildbot/master_test.go
diff --git a/milo/job_source/buildbot/pubsub.go b/milo/build_source/buildbot/pubsub.go
similarity index 100%
rename from milo/job_source/buildbot/pubsub.go
rename to milo/build_source/buildbot/pubsub.go
diff --git a/milo/job_source/buildbot/pubsub_test.go b/milo/build_source/buildbot/pubsub_test.go
similarity index 100%
rename from milo/job_source/buildbot/pubsub_test.go
rename to milo/build_source/buildbot/pubsub_test.go
diff --git a/milo/job_source/buildbot/structs.go b/milo/build_source/buildbot/structs.go
similarity index 100%
rename from milo/job_source/buildbot/structs.go
rename to milo/build_source/buildbot/structs.go
diff --git a/milo/job_source/buildbot/testdata/CrWinGoma.30608.json b/milo/build_source/buildbot/testdata/CrWinGoma.30608.json
similarity index 100%
rename from milo/job_source/buildbot/testdata/CrWinGoma.30608.json
rename to milo/build_source/buildbot/testdata/CrWinGoma.30608.json
diff --git a/milo/job_source/buildbot/testdata/chromium_presubmit.426944.json b/milo/build_source/buildbot/testdata/chromium_presubmit.426944.json
similarity index 100%
rename from milo/job_source/buildbot/testdata/chromium_presubmit.426944.json
rename to milo/build_source/buildbot/testdata/chromium_presubmit.426944.json
diff --git a/milo/job_source/buildbot/testdata/gerritCL.1234.json b/milo/build_source/buildbot/testdata/gerritCL.1234.json
similarity index 100%
rename from milo/job_source/buildbot/testdata/gerritCL.1234.json
rename to milo/build_source/buildbot/testdata/gerritCL.1234.json
diff --git a/milo/job_source/buildbot/testdata/newline.1234.json b/milo/build_source/buildbot/testdata/newline.1234.json
similarity index 100%
rename from milo/job_source/buildbot/testdata/newline.1234.json
rename to milo/build_source/buildbot/testdata/newline.1234.json
diff --git a/milo/job_source/buildbot/testdata/win_chromium_rel_ng.246309.json b/milo/build_source/buildbot/testdata/win_chromium_rel_ng.246309.json
similarity index 100%
rename from milo/job_source/buildbot/testdata/win_chromium_rel_ng.246309.json
rename to milo/build_source/buildbot/testdata/win_chromium_rel_ng.246309.json
diff --git a/milo/job_source/buildbucket/buckets.go b/milo/build_source/buildbucket/buckets.go
similarity index 100%
rename from milo/job_source/buildbucket/buckets.go
rename to milo/build_source/buildbucket/buckets.go
diff --git a/milo/job_source/buildbucket/builder.go b/milo/build_source/buildbucket/builder.go
similarity index 100%
rename from milo/job_source/buildbucket/builder.go
rename to milo/build_source/buildbucket/builder.go
diff --git a/milo/job_source/buildbucket/builder_test.go b/milo/build_source/buildbucket/builder_test.go
similarity index 100%
rename from milo/job_source/buildbucket/builder_test.go
rename to milo/build_source/buildbucket/builder_test.go
diff --git a/milo/job_source/buildbucket/common.go b/milo/build_source/buildbucket/common.go
similarity index 100%
rename from milo/job_source/buildbucket/common.go
rename to milo/build_source/buildbucket/common.go
diff --git a/milo/job_source/buildbucket/expectations/master.tryserver.infra/InfraPresubmit.Swarming.json b/milo/build_source/buildbucket/expectations/master.tryserver.infra/InfraPresubmit.Swarming.json
similarity index 100%
rename from milo/job_source/buildbucket/expectations/master.tryserver.infra/InfraPresubmit.Swarming.json
rename to milo/build_source/buildbucket/expectations/master.tryserver.infra/InfraPresubmit.Swarming.json
diff --git a/milo/job_source/buildbucket/expectations/master.tryserver.infra/InfraPresubmit.json b/milo/build_source/buildbucket/expectations/master.tryserver.infra/InfraPresubmit.json
similarity index 100%
rename from milo/job_source/buildbucket/expectations/master.tryserver.infra/InfraPresubmit.json
rename to milo/build_source/buildbucket/expectations/master.tryserver.infra/InfraPresubmit.json
diff --git a/milo/job_source/buildbucket/html.go b/milo/build_source/buildbucket/html.go
similarity index 100%
rename from milo/job_source/buildbucket/html.go
rename to milo/build_source/buildbucket/html.go
diff --git a/milo/job_source/buildbucket/properties.go b/milo/build_source/buildbucket/properties.go
similarity index 100%
rename from milo/job_source/buildbucket/properties.go
rename to milo/build_source/buildbucket/properties.go
diff --git a/milo/job_source/buildbucket/testdata/master.tryserver.infra/InfraPresubmit.Swarming.json b/milo/build_source/buildbucket/testdata/master.tryserver.infra/InfraPresubmit.Swarming.json
similarity index 100%
rename from milo/job_source/buildbucket/testdata/master.tryserver.infra/InfraPresubmit.Swarming.json
rename to milo/build_source/buildbucket/testdata/master.tryserver.infra/InfraPresubmit.Swarming.json
diff --git a/milo/job_source/buildbucket/testdata/master.tryserver.infra/InfraPresubmit.json b/milo/build_source/buildbucket/testdata/master.tryserver.infra/InfraPresubmit.json
similarity index 100%
rename from milo/job_source/buildbucket/testdata/master.tryserver.infra/InfraPresubmit.json
rename to milo/build_source/buildbucket/testdata/master.tryserver.infra/InfraPresubmit.json
diff --git a/milo/job_source/raw_presentation/build.go b/milo/build_source/raw_presentation/build.go
similarity index 98%
rename from milo/job_source/raw_presentation/build.go
rename to milo/build_source/raw_presentation/build.go
index 2807c1c..b1b1b47 100644
--- a/milo/job_source/raw_presentation/build.go
+++ b/milo/build_source/raw_presentation/build.go
@@ -18,7 +18,7 @@
"github.com/luci/luci-go/logdog/common/viewer"
"github.com/luci/luci-go/luci_config/common/cfgtypes"
"github.com/luci/luci-go/milo/api/resp"
- "github.com/luci/luci-go/milo/job_source/raw_presentation/internal"
+ "github.com/luci/luci-go/milo/build_source/raw_presentation/internal"
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
diff --git a/milo/job_source/raw_presentation/html.go b/milo/build_source/raw_presentation/html.go
similarity index 100%
rename from milo/job_source/raw_presentation/html.go
rename to milo/build_source/raw_presentation/html.go
diff --git a/milo/job_source/raw_presentation/internal/gen.go b/milo/build_source/raw_presentation/internal/gen.go
similarity index 100%
rename from milo/job_source/raw_presentation/internal/gen.go
rename to milo/build_source/raw_presentation/internal/gen.go
diff --git a/milo/job_source/raw_presentation/internal/stream.pb.go b/milo/build_source/raw_presentation/internal/stream.pb.go
similarity index 90%
rename from milo/job_source/raw_presentation/internal/stream.pb.go
rename to milo/build_source/raw_presentation/internal/stream.pb.go
index e0a7f63..3525050 100644
--- a/milo/job_source/raw_presentation/internal/stream.pb.go
+++ b/milo/build_source/raw_presentation/internal/stream.pb.go
@@ -1,11 +1,11 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: github.com/luci/luci-go/milo/appengine/job_source/raw_presentation/internal/stream.proto
+// source: github.com/luci/luci-go/milo/appengine/build_source/raw_presentation/internal/stream.proto
/*
Package internal is a generated protocol buffer package.
It is generated from these files:
- github.com/luci/luci-go/milo/appengine/job_source/raw_presentation/internal/stream.proto
+ github.com/luci/luci-go/milo/appengine/build_source/raw_presentation/internal/stream.proto
It has these top-level messages:
CachedStep
@@ -61,7 +61,7 @@
}
func init() {
- proto.RegisterFile("github.com/luci/luci-go/milo/appengine/job_source/raw_presentation/internal/stream.proto", fileDescriptor0)
+ proto.RegisterFile("github.com/luci/luci-go/milo/appengine/build_source/raw_presentation/internal/stream.proto", fileDescriptor0)
}
var fileDescriptor0 = []byte{
diff --git a/milo/job_source/raw_presentation/internal/stream.proto b/milo/build_source/raw_presentation/internal/stream.proto
similarity index 100%
rename from milo/job_source/raw_presentation/internal/stream.proto
rename to milo/build_source/raw_presentation/internal/stream.proto
diff --git a/milo/job_source/raw_presentation/logDogBuild.go b/milo/build_source/raw_presentation/logDogBuild.go
similarity index 100%
rename from milo/job_source/raw_presentation/logDogBuild.go
rename to milo/build_source/raw_presentation/logDogBuild.go
diff --git a/milo/job_source/raw_presentation/logDogStream.go b/milo/build_source/raw_presentation/logDogStream.go
similarity index 100%
rename from milo/job_source/raw_presentation/logDogStream.go
rename to milo/build_source/raw_presentation/logDogStream.go
diff --git a/milo/job_source/swarming/README.md b/milo/build_source/swarming/README.md
similarity index 100%
rename from milo/job_source/swarming/README.md
rename to milo/build_source/swarming/README.md
diff --git a/milo/job_source/swarming/build.go b/milo/build_source/swarming/build.go
similarity index 99%
rename from milo/job_source/swarming/build.go
rename to milo/build_source/swarming/build.go
index 7d42894..c4a7c9d 100644
--- a/milo/job_source/swarming/build.go
+++ b/milo/build_source/swarming/build.go
@@ -24,9 +24,9 @@
"github.com/luci/luci-go/logdog/client/coordinator"
"github.com/luci/luci-go/logdog/common/types"
"github.com/luci/luci-go/milo/api/resp"
+ "github.com/luci/luci-go/milo/build_source/raw_presentation"
"github.com/luci/luci-go/milo/common"
"github.com/luci/luci-go/milo/common/model"
- "github.com/luci/luci-go/milo/job_source/raw_presentation"
"github.com/luci/luci-go/server/auth"
)
diff --git a/milo/job_source/swarming/buildLog.go b/milo/build_source/swarming/buildLog.go
similarity index 100%
rename from milo/job_source/swarming/buildLog.go
rename to milo/build_source/swarming/buildLog.go
diff --git a/milo/job_source/swarming/buildLog_test.go b/milo/build_source/swarming/buildLog_test.go
similarity index 100%
rename from milo/job_source/swarming/buildLog_test.go
rename to milo/build_source/swarming/buildLog_test.go
diff --git a/milo/job_source/swarming/build_test.go b/milo/build_source/swarming/build_test.go
similarity index 100%
rename from milo/job_source/swarming/build_test.go
rename to milo/build_source/swarming/build_test.go
diff --git a/milo/job_source/swarming/buildinfo.go b/milo/build_source/swarming/buildinfo.go
similarity index 100%
rename from milo/job_source/swarming/buildinfo.go
rename to milo/build_source/swarming/buildinfo.go
diff --git a/milo/job_source/swarming/buildinfo_test.go b/milo/build_source/swarming/buildinfo_test.go
similarity index 100%
rename from milo/job_source/swarming/buildinfo_test.go
rename to milo/build_source/swarming/buildinfo_test.go
diff --git a/milo/job_source/swarming/expectations/build-canceled.json b/milo/build_source/swarming/expectations/build-canceled.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-canceled.json
rename to milo/build_source/swarming/expectations/build-canceled.json
diff --git a/milo/job_source/swarming/expectations/build-exception.json b/milo/build_source/swarming/expectations/build-exception.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-exception.json
rename to milo/build_source/swarming/expectations/build-exception.json
diff --git a/milo/job_source/swarming/expectations/build-expired.json b/milo/build_source/swarming/expectations/build-expired.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-expired.json
rename to milo/build_source/swarming/expectations/build-expired.json
diff --git a/milo/job_source/swarming/expectations/build-finished-logdog-expired-stream.json b/milo/build_source/swarming/expectations/build-finished-logdog-expired-stream.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-finished-logdog-expired-stream.json
rename to milo/build_source/swarming/expectations/build-finished-logdog-expired-stream.json
diff --git a/milo/job_source/swarming/expectations/build-gerrit.json b/milo/build_source/swarming/expectations/build-gerrit.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-gerrit.json
rename to milo/build_source/swarming/expectations/build-gerrit.json
diff --git a/milo/job_source/swarming/expectations/build-internal.json b/milo/build_source/swarming/expectations/build-internal.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-internal.json
rename to milo/build_source/swarming/expectations/build-internal.json
diff --git a/milo/job_source/swarming/expectations/build-link.json b/milo/build_source/swarming/expectations/build-link.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-link.json
rename to milo/build_source/swarming/expectations/build-link.json
diff --git a/milo/job_source/swarming/expectations/build-nested.json b/milo/build_source/swarming/expectations/build-nested.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-nested.json
rename to milo/build_source/swarming/expectations/build-nested.json
diff --git a/milo/job_source/swarming/expectations/build-patch-failure.json b/milo/build_source/swarming/expectations/build-patch-failure.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-patch-failure.json
rename to milo/build_source/swarming/expectations/build-patch-failure.json
diff --git a/milo/job_source/swarming/expectations/build-pending-logdog.json b/milo/build_source/swarming/expectations/build-pending-logdog.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-pending-logdog.json
rename to milo/build_source/swarming/expectations/build-pending-logdog.json
diff --git a/milo/job_source/swarming/expectations/build-pending.json b/milo/build_source/swarming/expectations/build-pending.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-pending.json
rename to milo/build_source/swarming/expectations/build-pending.json
diff --git a/milo/job_source/swarming/expectations/build-running-logdog-no-annotation-stream.json b/milo/build_source/swarming/expectations/build-running-logdog-no-annotation-stream.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-running-logdog-no-annotation-stream.json
rename to milo/build_source/swarming/expectations/build-running-logdog-no-annotation-stream.json
diff --git a/milo/job_source/swarming/expectations/build-running-logdog.json b/milo/build_source/swarming/expectations/build-running-logdog.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-running-logdog.json
rename to milo/build_source/swarming/expectations/build-running-logdog.json
diff --git a/milo/job_source/swarming/expectations/build-running.json b/milo/build_source/swarming/expectations/build-running.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-running.json
rename to milo/build_source/swarming/expectations/build-running.json
diff --git a/milo/job_source/swarming/expectations/build-timeout.json b/milo/build_source/swarming/expectations/build-timeout.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-timeout.json
rename to milo/build_source/swarming/expectations/build-timeout.json
diff --git a/milo/job_source/swarming/expectations/build-unicode.json b/milo/build_source/swarming/expectations/build-unicode.json
similarity index 100%
rename from milo/job_source/swarming/expectations/build-unicode.json
rename to milo/build_source/swarming/expectations/build-unicode.json
diff --git a/milo/job_source/swarming/html.go b/milo/build_source/swarming/html.go
similarity index 100%
rename from milo/job_source/swarming/html.go
rename to milo/build_source/swarming/html.go
diff --git a/milo/job_source/swarming/html_data.go b/milo/build_source/swarming/html_data.go
similarity index 98%
rename from milo/job_source/swarming/html_data.go
rename to milo/build_source/swarming/html_data.go
index 6922f89..8590a39 100644
--- a/milo/job_source/swarming/html_data.go
+++ b/milo/build_source/swarming/html_data.go
@@ -48,7 +48,7 @@
func getTestCases(swarmingRelDir string) []*testCase {
testCases := make(map[string]*testCase)
- // References "milo/appengine/job_source/swarming/testdata".
+ // References "milo/appengine/build_source/swarming/testdata".
testdata := filepath.Join(swarmingRelDir, "testdata")
f, err := ioutil.ReadDir(testdata)
if err != nil {
diff --git a/milo/job_source/swarming/html_test.go b/milo/build_source/swarming/html_test.go
similarity index 100%
rename from milo/job_source/swarming/html_test.go
rename to milo/build_source/swarming/html_test.go
diff --git a/milo/job_source/swarming/memoryClient.go b/milo/build_source/swarming/memoryClient.go
similarity index 98%
rename from milo/job_source/swarming/memoryClient.go
rename to milo/build_source/swarming/memoryClient.go
index fc3379d..e3fdfb5 100644
--- a/milo/job_source/swarming/memoryClient.go
+++ b/milo/build_source/swarming/memoryClient.go
@@ -12,7 +12,7 @@
miloProto "github.com/luci/luci-go/common/proto/milo"
"github.com/luci/luci-go/logdog/client/butlerlib/streamclient"
"github.com/luci/luci-go/logdog/client/butlerlib/streamproto"
- "github.com/luci/luci-go/milo/job_source/raw_presentation"
+ "github.com/luci/luci-go/milo/build_source/raw_presentation"
)
// In-memory datastructure to hold a fake butler client.
diff --git a/milo/job_source/swarming/testdata/build-canceled b/milo/build_source/swarming/testdata/build-canceled
similarity index 100%
rename from milo/job_source/swarming/testdata/build-canceled
rename to milo/build_source/swarming/testdata/build-canceled
diff --git a/milo/job_source/swarming/testdata/build-canceled.swarm b/milo/build_source/swarming/testdata/build-canceled.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-canceled.swarm
rename to milo/build_source/swarming/testdata/build-canceled.swarm
diff --git a/milo/job_source/swarming/testdata/build-exception b/milo/build_source/swarming/testdata/build-exception
similarity index 100%
rename from milo/job_source/swarming/testdata/build-exception
rename to milo/build_source/swarming/testdata/build-exception
diff --git a/milo/job_source/swarming/testdata/build-exception.swarm b/milo/build_source/swarming/testdata/build-exception.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-exception.swarm
rename to milo/build_source/swarming/testdata/build-exception.swarm
diff --git a/milo/job_source/swarming/testdata/build-expired.swarm b/milo/build_source/swarming/testdata/build-expired.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-expired.swarm
rename to milo/build_source/swarming/testdata/build-expired.swarm
diff --git a/milo/job_source/swarming/testdata/build-finished-logdog-expired-stream b/milo/build_source/swarming/testdata/build-finished-logdog-expired-stream
similarity index 100%
rename from milo/job_source/swarming/testdata/build-finished-logdog-expired-stream
rename to milo/build_source/swarming/testdata/build-finished-logdog-expired-stream
diff --git a/milo/job_source/swarming/testdata/build-finished-logdog-expired-stream.swarm b/milo/build_source/swarming/testdata/build-finished-logdog-expired-stream.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-finished-logdog-expired-stream.swarm
rename to milo/build_source/swarming/testdata/build-finished-logdog-expired-stream.swarm
diff --git a/milo/job_source/swarming/testdata/build-gerrit b/milo/build_source/swarming/testdata/build-gerrit
similarity index 100%
rename from milo/job_source/swarming/testdata/build-gerrit
rename to milo/build_source/swarming/testdata/build-gerrit
diff --git a/milo/job_source/swarming/testdata/build-gerrit.swarm b/milo/build_source/swarming/testdata/build-gerrit.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-gerrit.swarm
rename to milo/build_source/swarming/testdata/build-gerrit.swarm
diff --git a/milo/job_source/swarming/testdata/build-internal b/milo/build_source/swarming/testdata/build-internal
similarity index 100%
rename from milo/job_source/swarming/testdata/build-internal
rename to milo/build_source/swarming/testdata/build-internal
diff --git a/milo/job_source/swarming/testdata/build-internal.swarm b/milo/build_source/swarming/testdata/build-internal.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-internal.swarm
rename to milo/build_source/swarming/testdata/build-internal.swarm
diff --git a/milo/job_source/swarming/testdata/build-link b/milo/build_source/swarming/testdata/build-link
similarity index 100%
rename from milo/job_source/swarming/testdata/build-link
rename to milo/build_source/swarming/testdata/build-link
diff --git a/milo/job_source/swarming/testdata/build-link.swarm b/milo/build_source/swarming/testdata/build-link.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-link.swarm
rename to milo/build_source/swarming/testdata/build-link.swarm
diff --git a/milo/job_source/swarming/testdata/build-nested b/milo/build_source/swarming/testdata/build-nested
similarity index 100%
rename from milo/job_source/swarming/testdata/build-nested
rename to milo/build_source/swarming/testdata/build-nested
diff --git a/milo/job_source/swarming/testdata/build-nested.swarm b/milo/build_source/swarming/testdata/build-nested.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-nested.swarm
rename to milo/build_source/swarming/testdata/build-nested.swarm
diff --git a/milo/job_source/swarming/testdata/build-patch-failure b/milo/build_source/swarming/testdata/build-patch-failure
similarity index 100%
rename from milo/job_source/swarming/testdata/build-patch-failure
rename to milo/build_source/swarming/testdata/build-patch-failure
diff --git a/milo/job_source/swarming/testdata/build-patch-failure.swarm b/milo/build_source/swarming/testdata/build-patch-failure.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-patch-failure.swarm
rename to milo/build_source/swarming/testdata/build-patch-failure.swarm
diff --git a/milo/job_source/swarming/testdata/build-pending-logdog.swarm b/milo/build_source/swarming/testdata/build-pending-logdog.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-pending-logdog.swarm
rename to milo/build_source/swarming/testdata/build-pending-logdog.swarm
diff --git a/milo/job_source/swarming/testdata/build-pending.swarm b/milo/build_source/swarming/testdata/build-pending.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-pending.swarm
rename to milo/build_source/swarming/testdata/build-pending.swarm
diff --git a/milo/job_source/swarming/testdata/build-running b/milo/build_source/swarming/testdata/build-running
similarity index 100%
rename from milo/job_source/swarming/testdata/build-running
rename to milo/build_source/swarming/testdata/build-running
diff --git a/milo/job_source/swarming/testdata/build-running-logdog b/milo/build_source/swarming/testdata/build-running-logdog
similarity index 100%
rename from milo/job_source/swarming/testdata/build-running-logdog
rename to milo/build_source/swarming/testdata/build-running-logdog
diff --git a/milo/job_source/swarming/testdata/build-running-logdog-no-annotation-stream.swarm b/milo/build_source/swarming/testdata/build-running-logdog-no-annotation-stream.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-running-logdog-no-annotation-stream.swarm
rename to milo/build_source/swarming/testdata/build-running-logdog-no-annotation-stream.swarm
diff --git a/milo/job_source/swarming/testdata/build-running-logdog.pb.txt b/milo/build_source/swarming/testdata/build-running-logdog.pb.txt
similarity index 100%
rename from milo/job_source/swarming/testdata/build-running-logdog.pb.txt
rename to milo/build_source/swarming/testdata/build-running-logdog.pb.txt
diff --git a/milo/job_source/swarming/testdata/build-running-logdog.swarm b/milo/build_source/swarming/testdata/build-running-logdog.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-running-logdog.swarm
rename to milo/build_source/swarming/testdata/build-running-logdog.swarm
diff --git a/milo/job_source/swarming/testdata/build-running.swarm b/milo/build_source/swarming/testdata/build-running.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-running.swarm
rename to milo/build_source/swarming/testdata/build-running.swarm
diff --git a/milo/job_source/swarming/testdata/build-timeout b/milo/build_source/swarming/testdata/build-timeout
similarity index 100%
rename from milo/job_source/swarming/testdata/build-timeout
rename to milo/build_source/swarming/testdata/build-timeout
diff --git a/milo/job_source/swarming/testdata/build-timeout.swarm b/milo/build_source/swarming/testdata/build-timeout.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-timeout.swarm
rename to milo/build_source/swarming/testdata/build-timeout.swarm
diff --git a/milo/job_source/swarming/testdata/build-unicode b/milo/build_source/swarming/testdata/build-unicode
similarity index 100%
rename from milo/job_source/swarming/testdata/build-unicode
rename to milo/build_source/swarming/testdata/build-unicode
diff --git a/milo/job_source/swarming/testdata/build-unicode.swarm b/milo/build_source/swarming/testdata/build-unicode.swarm
similarity index 100%
rename from milo/job_source/swarming/testdata/build-unicode.swarm
rename to milo/build_source/swarming/testdata/build-unicode.swarm
diff --git a/milo/frontend/buildbot_data.go b/milo/frontend/buildbot_data.go
index 54ac5a6..0e2a906 100644
--- a/milo/frontend/buildbot_data.go
+++ b/milo/frontend/buildbot_data.go
@@ -10,8 +10,8 @@
"github.com/luci/gae/impl/memory"
"github.com/luci/luci-go/common/clock/testclock"
"github.com/luci/luci-go/milo/api/resp"
+ "github.com/luci/luci-go/milo/build_source/buildbot"
"github.com/luci/luci-go/milo/common"
- "github.com/luci/luci-go/milo/job_source/buildbot"
"github.com/luci/luci-go/server/templates"
"golang.org/x/net/context"
)
@@ -22,7 +22,7 @@
c, _ = testclock.UseTime(c, testclock.TestTimeUTC)
bundles := []common.TestBundle{}
for _, tc := range buildbot.TestCases {
- build, err := buildbot.DebugBuild(c, "../job_source/buildbot", tc.Builder, tc.Build)
+ build, err := buildbot.DebugBuild(c, "../build_source/buildbot", tc.Builder, tc.Build)
if err != nil {
panic(fmt.Errorf(
"Encountered error while building debug/%s/%s.\n%s",
diff --git a/milo/frontend/console/console.go b/milo/frontend/console/console.go
index 107ace0..13dcfaa 100644
--- a/milo/frontend/console/console.go
+++ b/milo/frontend/console/console.go
@@ -17,9 +17,9 @@
"github.com/luci/luci-go/milo/api/config"
"github.com/luci/luci-go/milo/api/resp"
+ "github.com/luci/luci-go/milo/build_source/buildbot"
"github.com/luci/luci-go/milo/common"
"github.com/luci/luci-go/milo/common/gitiles"
- "github.com/luci/luci-go/milo/job_source/buildbot"
)
// Returns results of build[commit_index][builder_index]
diff --git a/milo/frontend/frontpage.go b/milo/frontend/frontpage.go
index 139a5f2..aa32a53 100644
--- a/milo/frontend/frontpage.go
+++ b/milo/frontend/frontpage.go
@@ -10,9 +10,9 @@
"github.com/luci/luci-go/common/sync/parallel"
"github.com/luci/luci-go/milo/api/resp"
+ "github.com/luci/luci-go/milo/build_source/buildbot"
+ "github.com/luci/luci-go/milo/build_source/buildbucket"
"github.com/luci/luci-go/milo/common"
- "github.com/luci/luci-go/milo/job_source/buildbot"
- "github.com/luci/luci-go/milo/job_source/buildbucket"
)
func frontpageHandler(c *router.Context) {
diff --git a/milo/frontend/main.go b/milo/frontend/main.go
index 5067da7..6ce8061 100644
--- a/milo/frontend/main.go
+++ b/milo/frontend/main.go
@@ -15,12 +15,12 @@
"github.com/luci/luci-go/grpc/grpcmon"
"github.com/luci/luci-go/grpc/prpc"
milo "github.com/luci/luci-go/milo/api/proto"
+ "github.com/luci/luci-go/milo/build_source/buildbot"
+ "github.com/luci/luci-go/milo/build_source/buildbucket"
+ "github.com/luci/luci-go/milo/build_source/raw_presentation"
+ "github.com/luci/luci-go/milo/build_source/swarming"
"github.com/luci/luci-go/milo/common"
"github.com/luci/luci-go/milo/frontend/console"
- "github.com/luci/luci-go/milo/job_source/buildbot"
- "github.com/luci/luci-go/milo/job_source/buildbucket"
- "github.com/luci/luci-go/milo/job_source/raw_presentation"
- "github.com/luci/luci-go/milo/job_source/swarming"
"github.com/luci/luci-go/milo/rpc"
"github.com/luci/luci-go/server/router"
)
diff --git a/milo/frontend/main_test.go b/milo/frontend/main_test.go
index 31bc0e8..d71b980 100644
--- a/milo/frontend/main_test.go
+++ b/milo/frontend/main_test.go
@@ -20,8 +20,8 @@
"github.com/luci/gae/impl/memory"
"github.com/luci/luci-go/common/clock/testclock"
+ "github.com/luci/luci-go/milo/build_source/swarming"
"github.com/luci/luci-go/milo/common"
- "github.com/luci/luci-go/milo/job_source/swarming"
"github.com/luci/luci-go/server/auth"
"github.com/luci/luci-go/server/auth/authtest"
"github.com/luci/luci-go/server/auth/identity"
@@ -42,7 +42,7 @@
{buildbotBuildTestData, "buildbot.build", "build.html"},
{buildbotBuilderTestData, "buildbot.builder", "builder.html"},
{func() []common.TestBundle {
- return swarming.BuildTestData("../job_source/swarming")
+ return swarming.BuildTestData("../build_source/swarming")
}, "swarming.build", "build.html"},
{swarming.LogTestData, "swarming.log", "log.html"},
{frontpageTestData, "frontpage", "frontpage.html"},
diff --git a/milo/rpc/buildinfo.go b/milo/rpc/buildinfo.go
index abac93e..a850a5a 100644
--- a/milo/rpc/buildinfo.go
+++ b/milo/rpc/buildinfo.go
@@ -8,8 +8,8 @@
"github.com/luci/luci-go/grpc/grpcutil"
"github.com/luci/luci-go/luci_config/common/cfgtypes"
milo "github.com/luci/luci-go/milo/api/proto"
- "github.com/luci/luci-go/milo/job_source/buildbot"
- "github.com/luci/luci-go/milo/job_source/swarming"
+ "github.com/luci/luci-go/milo/build_source/buildbot"
+ "github.com/luci/luci-go/milo/build_source/swarming"
"google.golang.org/grpc/codes"
