rebase

Author: roychying

stovepipe/core/messagequeue/messagequeue_test.go

@@ -69,11 +69,7 @@ func TestWireFormat(t *testing.T) {
 // no topic_keys option names an unknown key.
 func TestTopicKeysBindEveryTopicKey(t *testing.T) {
 	bound := map[string]int{}
-<<<<<<< HEAD:stovepipe/core/messagequeue/process_test.go
-	for _, m := range []proto.Message{&ProcessRequest{}, &BuildRequest{}} {
-=======
 	for _, m := range []proto.Message{&ProcessRequest{}, &BuildRequest{}, &BuildSignal{}} {
->>>>>>> fe02a12 (feat(stovepipe): add BuildRequest/BuildSignal queue contract):stovepipe/core/messagequeue/messagequeue_test.go
 		keys := TopicKeys(m)
 		require.NotEmpty(t, keys, "message must declare a non-empty topic_keys option")
 		for _, key := range keys {

stovepipe/core/messagequeue/protopb/BUILD.bazel

@@ -4,10 +4,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "build.pb.go",
-<<<<<<< HEAD
-=======
         "buildsignal.pb.go",
->>>>>>> fe02a12 (feat(stovepipe): add BuildRequest/BuildSignal queue contract)
         "process.pb.go",
     ],
     importpath = "github.com/uber/submitqueue/stovepipe/core/messagequeue/protopb",

stovepipe/core/messagequeue/topics.go

@@ -28,12 +28,6 @@ const (
 	// controller consumes it, reloads the Request, and decides the build strategy.
 	TopicKeyProcess TopicKey = "process"
 
-<<<<<<< HEAD
-	// TopicKeyBuild carries admitted requests from process to build. process
-	// publishes a BuildRequest (the request id) after it persists the strategy
-	// and baseline; build reloads the Request from storage.
-	TopicKeyBuild TopicKey = "build"
-=======
 	// TopicKeyBuild carries requests whose build scope has been decided from
 	// process/analyze to the build stage. The producer publishes a BuildRequest
 	// (the request id) here; the build controller consumes it, reloads the
@@ -47,5 +41,4 @@ const (
 	// Partitioned by build id, so each build's poll loop is an independent
 	// partition.
 	TopicKeyBuildSignal TopicKey = "buildsignal"
->>>>>>> fe02a12 (feat(stovepipe): add BuildRequest/BuildSignal queue contract)
 )