return run details for list run

backend/api/run.proto

@@ -150,7 +150,8 @@ message TerminateRunRequest {
 }
 
 message ListRunsResponse {
-  repeated Run runs = 1;
+  repeated Run runs = 1 [deprecated=true];
+  repeated RunDetail run_details = 4;
   int32 total_size = 3;
   string next_page_token = 2;
 }

backend/src/apiserver/resource/resource_manager.go

@@ -230,7 +230,7 @@ func (r *ResourceManager) GetRun(runId string) (*model.RunDetail, error) {
 }
 
 func (r *ResourceManager) ListRuns(filterContext *common.FilterContext,
-	opts *list.Options) (runs []*model.Run, total_size int, nextPageToken string, err error) {
+	opts *list.Options) (runs []*model.RunDetail, total_size int, nextPageToken string, err error) {
 	return r.runStore.ListRuns(filterContext, opts)
 }
 

backend/src/apiserver/server/api_converter.go

@@ -131,10 +131,18 @@ func toApiRun(run *model.Run) *api.Run {
 	}
 }
 
-func ToApiRuns(runs []*model.Run) []*api.Run {
+func ToApiRuns(runs []*model.RunDetail) []*api.Run {
 	apiRuns := make([]*api.Run, 0)
 	for _, run := range runs {
-		apiRuns = append(apiRuns, toApiRun(run))
+		apiRuns = append(apiRuns, toApiRun(&run.Run))
+	}
+	return apiRuns
+}
+
+func ToApiRunDetails(runs []*model.RunDetail) []*api.RunDetail {
+	apiRuns := make([]*api.RunDetail, 0)
+	for _, run := range runs {
+		apiRuns = append(apiRuns, ToApiRunDetail(run))
 	}
 	return apiRuns
 }

backend/src/apiserver/server/api_converter_test.go

@@ -124,43 +124,50 @@ func TestToApiRuns(t *testing.T) {
 		Value:  &api.RunMetric_NumberValue{NumberValue: metric2.NumberValue},
 		Format: api.RunMetric_PERCENTAGE,
 	}
-	modelRun1 := model.Run{
+	modelRun1 := model.RunDetail{
-		UUID:             "run1",
+		Run: model.Run{
-		Name:             "name1",
+			UUID:             "run1",
-		StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
+			Name:             "name1",
-		DisplayName:      "displayName1",
+			StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
-		Namespace:        "ns1",
+			DisplayName:      "displayName1",
-		CreatedAtInSec:   1,
+			Namespace:        "ns1",
-		ScheduledAtInSec: 1,
+			CreatedAtInSec:   1,
-		Conditions:       "running",
+			ScheduledAtInSec: 1,
-		PipelineSpec: model.PipelineSpec{
+			Conditions:       "running",
-			WorkflowSpecManifest: "manifest",
+			PipelineSpec: model.PipelineSpec{
+				WorkflowSpecManifest: "manifest",
+			},
+			ResourceReferences: []*model.ResourceReference{
+				{ResourceUUID: "run1", ResourceType: common.Run,
+					ReferenceUUID: "job1", ReferenceType: common.Job, Relationship: common.Creator},
+			},
+			Metrics: []*model.RunMetric{metric1, metric2},
 		},
-		ResourceReferences: []*model.ResourceReference{
+		PipelineRuntime: model.PipelineRuntime{WorkflowRuntimeManifest: "workflow123"},
-			{ResourceUUID: "run1", ResourceType: common.Run,
-				ReferenceUUID: "job1", ReferenceType: common.Job, Relationship: common.Creator},
-		},
-		Metrics: []*model.RunMetric{metric1, metric2},
 	}
-	modelRun2 := model.Run{
+
-		UUID:             "run2",
+	modelRun2 := model.RunDetail{
-		Name:             "name2",
+		Run: model.Run{
-		StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
+			UUID:             "run2",
-		DisplayName:      "displayName2",
+			Name:             "name2",
-		Namespace:        "ns2",
+			StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
-		CreatedAtInSec:   2,
+			DisplayName:      "displayName2",
-		ScheduledAtInSec: 2,
+			Namespace:        "ns2",
-		Conditions:       "done",
+			CreatedAtInSec:   2,
-		PipelineSpec: model.PipelineSpec{
+			ScheduledAtInSec: 2,
-			WorkflowSpecManifest: "manifest",
+			Conditions:       "done",
+			PipelineSpec: model.PipelineSpec{
+				WorkflowSpecManifest: "manifest",
+			},
+			ResourceReferences: []*model.ResourceReference{
+				{ResourceUUID: "run2", ResourceType: common.Run,
+					ReferenceUUID: "job2", ReferenceType: common.Job, Relationship: common.Creator},
+			},
+			Metrics: []*model.RunMetric{metric2},
 		},
-		ResourceReferences: []*model.ResourceReference{
+		PipelineRuntime: model.PipelineRuntime{WorkflowRuntimeManifest: "workflow123"},
-			{ResourceUUID: "run2", ResourceType: common.Run,
-				ReferenceUUID: "job2", ReferenceType: common.Job, Relationship: common.Creator},
-		},
-		Metrics: []*model.RunMetric{metric2},
 	}
-	apiRuns := ToApiRuns([]*model.Run{&modelRun1, &modelRun2})
+	apiRuns := ToApiRuns([]*model.RunDetail{&modelRun1, &modelRun2})
 	expectedApiRun := []*api.Run{
 		{
 			Id:           "run1",

backend/src/apiserver/server/run_server.go

@@ -63,7 +63,7 @@ func (s *RunServer) ListRuns(ctx context.Context, request *api.ListRunsRequest)
 	if err != nil {
 		return nil, util.Wrap(err, "Failed to list runs.")
 	}
-	return &api.ListRunsResponse{Runs: ToApiRuns(runs), TotalSize: int32(total_size), NextPageToken: nextPageToken}, nil
+	return &api.ListRunsResponse{Runs: ToApiRuns(runs), RunDetails: ToApiRunDetails(runs),TotalSize: int32(total_size), NextPageToken: nextPageToken}, nil
 }
 
 func (s *RunServer) ArchiveRun(ctx context.Context, request *api.ArchiveRunRequest) (*empty.Empty, error) {

backend/src/apiserver/storage/run_store.go

@@ -34,7 +34,7 @@ import (
 type RunStoreInterface interface {
 	GetRun(runId string) (*model.RunDetail, error)
 
-	ListRuns(filterContext *common.FilterContext, opts *list.Options) ([]*model.Run, int, string, error)
+	ListRuns(filterContext *common.FilterContext, opts *list.Options) ([]*model.RunDetail, int, string, error)
 
 	// Create a run entry in the database
 	CreateRun(run *model.RunDetail) (*model.RunDetail, error)
@@ -72,8 +72,8 @@ type RunStore struct {
 // total_size. The total_size does not reflect the page size, but it does reflect the number of runs
 // matching the supplied filters and resource references.
 func (s *RunStore) ListRuns(
-	filterContext *common.FilterContext, opts *list.Options) ([]*model.Run, int, string, error) {
+	filterContext *common.FilterContext, opts *list.Options) ([]*model.RunDetail, int, string, error) {
-	errorF := func(err error) ([]*model.Run, int, string, error) {
+	errorF := func(err error) ([]*model.RunDetail, int, string, error) {
 		return nil, 0, "", util.NewInternalServerError(err, "Failed to list runs: %v", err)
 	}
 
@@ -123,18 +123,12 @@ func (s *RunStore) ListRuns(
 		return errorF(err)
 	}
 
-	var runs []*model.Run
+	if len(runDetails) <= opts.PageSize {
-	for _, rd := range runDetails {
+		return runDetails, total_size, "", nil
-		r := rd.Run
-		runs = append(runs, &r)
 	}
 
-	if len(runs) <= opts.PageSize {
+	npt, err := opts.NextPageToken(runDetails[opts.PageSize])
-		return runs, total_size, "", nil
+	return runDetails[:opts.PageSize], total_size, npt, err
-	}
-
-	npt, err := opts.NextPageToken(runs[opts.PageSize])
-	return runs[:opts.PageSize], total_size, npt, err
 }
 
 func (s *RunStore) buildSelectRunsQuery(selectCount bool, opts *list.Options,

backend/src/apiserver/storage/run_store_test.go

@@ -27,6 +27,75 @@ import (
 	"google.golang.org/grpc/codes"
 )
 
+var run1 = &model.RunDetail{
+	Run: model.Run{
+		UUID:             "1",
+		Name:             "run1",
+		DisplayName:      "run1",
+		StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
+		Namespace:        "n1",
+		CreatedAtInSec:   1,
+		ScheduledAtInSec: 1,
+		Conditions:       "Running",
+		ResourceReferences: []*model.ResourceReference{
+			{
+				ResourceUUID:  "1", ResourceType: common.Run,
+				ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
+				Relationship:  common.Creator,
+			},
+		},
+	},
+	PipelineRuntime: model.PipelineRuntime{
+		WorkflowRuntimeManifest: "workflow1",
+	},
+}
+
+var run2 = &model.RunDetail{
+	Run: model.Run{
+		UUID:             "2",
+		Name:             "run2",
+		DisplayName:      "run2",
+		StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
+		Namespace:        "n2",
+		CreatedAtInSec:   2,
+		ScheduledAtInSec: 2,
+		Conditions:       "done",
+		ResourceReferences: []*model.ResourceReference{
+			{
+				ResourceUUID:  "2", ResourceType: common.Run,
+				ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
+				Relationship:  common.Creator,
+			},
+		},
+	},
+	PipelineRuntime: model.PipelineRuntime{
+		WorkflowRuntimeManifest: "workflow1",
+	},
+}
+
+var run3 = &model.RunDetail{
+	Run: model.Run{
+		UUID:             "3",
+		Name:             "run3",
+		DisplayName:      "run3",
+		Namespace:        "n3",
+		CreatedAtInSec:   3,
+		StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
+		ScheduledAtInSec: 3,
+		Conditions:       "done",
+		ResourceReferences: []*model.ResourceReference{
+			{
+				ResourceUUID:  "3", ResourceType: common.Run,
+				ReferenceUUID: defaultFakeExpIdTwo, ReferenceType: common.Experiment,
+				Relationship:  common.Creator,
+			},
+		},
+	},
+	PipelineRuntime: model.PipelineRuntime{
+		WorkflowRuntimeManifest: "workflow3",
+	},
+}
+
 func initializeRunStore() (*DB, *RunStore) {
 	db := NewFakeDbOrFatal()
 	expStore := NewExperimentStore(db, util.NewFakeTimeForEpoch(), util.NewFakeUUIDGeneratorOrFatal(defaultFakeExpId, nil))
@@ -35,72 +104,6 @@ func initializeRunStore() (*DB, *RunStore) {
 	expStore.CreateExperiment(&model.Experiment{Name: "exp2"})
 	runStore := NewRunStore(db, util.NewFakeTimeForEpoch(), nil)
 
-	run1 := &model.RunDetail{
-		Run: model.Run{
-			UUID:             "1",
-			Name:             "run1",
-			DisplayName:      "run1",
-			StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
-			Namespace:        "n1",
-			CreatedAtInSec:   1,
-			ScheduledAtInSec: 1,
-			Conditions:       "Running",
-			ResourceReferences: []*model.ResourceReference{
-				{
-					ResourceUUID: "1", ResourceType: common.Run,
-					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
-				},
-			},
-		},
-		PipelineRuntime: model.PipelineRuntime{
-			WorkflowRuntimeManifest: "workflow1",
-		},
-	}
-	run2 := &model.RunDetail{
-		Run: model.Run{
-			UUID:             "2",
-			Name:             "run2",
-			DisplayName:      "run2",
-			StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
-			Namespace:        "n2",
-			CreatedAtInSec:   2,
-			ScheduledAtInSec: 2,
-			Conditions:       "done",
-			ResourceReferences: []*model.ResourceReference{
-				{
-					ResourceUUID: "2", ResourceType: common.Run,
-					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
-				},
-			},
-		},
-		PipelineRuntime: model.PipelineRuntime{
-			WorkflowRuntimeManifest: "workflow1",
-		},
-	}
-	run3 := &model.RunDetail{
-		Run: model.Run{
-			UUID:             "3",
-			Name:             "run3",
-			DisplayName:      "run3",
-			Namespace:        "n3",
-			CreatedAtInSec:   3,
-			StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
-			ScheduledAtInSec: 3,
-			Conditions:       "done",
-			ResourceReferences: []*model.ResourceReference{
-				{
-					ResourceUUID: "3", ResourceType: common.Run,
-					ReferenceUUID: defaultFakeExpIdTwo, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
-				},
-			},
-		},
-		PipelineRuntime: model.PipelineRuntime{
-			WorkflowRuntimeManifest: "workflow3",
-		},
-	}
 	runStore.CreateRun(run1)
 	runStore.CreateRun(run2)
 	runStore.CreateRun(run3)
@@ -111,43 +114,6 @@ func TestListRuns_Pagination(t *testing.T) {
 	db, runStore := initializeRunStore()
 	defer db.Close()
 
-	expectedFirstPageRuns := []*model.Run{
-		{
-			UUID:             "1",
-			Name:             "run1",
-			DisplayName:      "run1",
-			Namespace:        "n1",
-			CreatedAtInSec:   1,
-			ScheduledAtInSec: 1,
-			StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
-			Conditions:       "Running",
-			ResourceReferences: []*model.ResourceReference{
-				{
-					ResourceUUID: "1", ResourceType: common.Run,
-					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
-				},
-			},
-		}}
-	expectedSecondPageRuns := []*model.Run{
-		{
-			UUID:             "2",
-			Name:             "run2",
-			DisplayName:      "run2",
-			Namespace:        "n2",
-			CreatedAtInSec:   2,
-			ScheduledAtInSec: 2,
-			StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
-			Conditions:       "done",
-			ResourceReferences: []*model.ResourceReference{
-				{
-					ResourceUUID: "2", ResourceType: common.Run,
-					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
-				},
-			},
-		}}
-
 	opts, err := list.NewOptions(&model.Run{}, 1, "", nil)
 	assert.Nil(t, err)
 
@@ -155,7 +121,7 @@ func TestListRuns_Pagination(t *testing.T) {
 		&common.FilterContext{ReferenceKey: &common.ReferenceKey{Type: common.Experiment, ID: defaultFakeExpId}}, opts)
 	assert.Nil(t, err)
 	assert.Equal(t, 2, total_size)
-	assert.Equal(t, expectedFirstPageRuns, runs, "Unexpected Run listed.")
+	assert.Equal(t, []*model.RunDetail{run1}, runs, "Unexpected Run listed.")
 	assert.NotEmpty(t, nextPageToken)
 
 	opts, err = list.NewOptionsFromToken(nextPageToken, 1)
@@ -164,7 +130,7 @@ func TestListRuns_Pagination(t *testing.T) {
 		&common.FilterContext{ReferenceKey: &common.ReferenceKey{Type: common.Experiment, ID: defaultFakeExpId}}, opts)
 	assert.Nil(t, err)
 	assert.Equal(t, 2, total_size)
-	assert.Equal(t, expectedSecondPageRuns, runs, "Unexpected Run listed.")
+	assert.Equal(t, []*model.RunDetail{run2}, runs, "Unexpected Run listed.")
 	assert.Empty(t, nextPageToken)
 }
 
@@ -209,43 +175,6 @@ func TestListRuns_Pagination_Descend(t *testing.T) {
 	db, runStore := initializeRunStore()
 	defer db.Close()
 
-	expectedFirstPageRuns := []*model.Run{
-		{
-			UUID:             "2",
-			Name:             "run2",
-			DisplayName:      "run2",
-			Namespace:        "n2",
-			CreatedAtInSec:   2,
-			ScheduledAtInSec: 2,
-			StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
-			Conditions:       "done",
-			ResourceReferences: []*model.ResourceReference{
-				{
-					ResourceUUID: "2", ResourceType: common.Run,
-					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
-				},
-			},
-		}}
-	expectedSecondPageRuns := []*model.Run{
-		{
-			UUID:             "1",
-			Name:             "run1",
-			DisplayName:      "run1",
-			Namespace:        "n1",
-			CreatedAtInSec:   1,
-			ScheduledAtInSec: 1,
-			StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
-			Conditions:       "Running",
-			ResourceReferences: []*model.ResourceReference{
-				{
-					ResourceUUID: "1", ResourceType: common.Run,
-					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
-				},
-			},
-		}}
-
 	opts, err := list.NewOptions(&model.Run{}, 1, "id desc", nil)
 	assert.Nil(t, err)
 	runs, total_size, nextPageToken, err := runStore.ListRuns(
@@ -253,7 +182,7 @@ func TestListRuns_Pagination_Descend(t *testing.T) {
 
 	assert.Nil(t, err)
 	assert.Equal(t, 2, total_size)
-	assert.Equal(t, expectedFirstPageRuns, runs, "Unexpected Run listed.")
+	assert.Equal(t, []*model.RunDetail{run2}, runs, "Unexpected Run listed.")
 	assert.NotEmpty(t, nextPageToken)
 
 	opts, err = list.NewOptionsFromToken(nextPageToken, 1)
@@ -262,7 +191,7 @@ func TestListRuns_Pagination_Descend(t *testing.T) {
 		&common.FilterContext{ReferenceKey: &common.ReferenceKey{Type: common.Experiment, ID: defaultFakeExpId}}, opts)
 	assert.Nil(t, err)
 	assert.Equal(t, 2, total_size)
-	assert.Equal(t, expectedSecondPageRuns, runs, "Unexpected Run listed.")
+	assert.Equal(t, []*model.RunDetail{run1}, runs, "Unexpected Run listed.")
 	assert.Empty(t, nextPageToken)
 }
 
@@ -270,49 +199,13 @@ func TestListRuns_Pagination_LessThanPageSize(t *testing.T) {
 	db, runStore := initializeRunStore()
 	defer db.Close()
 
-	expectedRuns := []*model.Run{
-		{
-			UUID:             "1",
-			Name:             "run1",
-			DisplayName:      "run1",
-			Namespace:        "n1",
-			CreatedAtInSec:   1,
-			ScheduledAtInSec: 1,
-			StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
-			Conditions:       "Running",
-			ResourceReferences: []*model.ResourceReference{
-				{
-					ResourceUUID: "1", ResourceType: common.Run,
-					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
-				},
-			},
-		},
-		{
-			UUID:             "2",
-			Name:             "run2",
-			DisplayName:      "run2",
-			Namespace:        "n2",
-			CreatedAtInSec:   2,
-			ScheduledAtInSec: 2,
-			StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
-			Conditions:       "done",
-			ResourceReferences: []*model.ResourceReference{
-				{
-					ResourceUUID: "2", ResourceType: common.Run,
-					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
-				},
-			},
-		}}
-
 	opts, err := list.NewOptions(&model.Run{}, 10, "", nil)
 	assert.Nil(t, err)
 	runs, total_size, nextPageToken, err := runStore.ListRuns(
 		&common.FilterContext{ReferenceKey: &common.ReferenceKey{Type: common.Experiment, ID: defaultFakeExpId}}, opts)
 	assert.Nil(t, err)
 	assert.Equal(t, 2, total_size)
-	assert.Equal(t, expectedRuns, runs, "Unexpected Run listed.")
+	assert.Equal(t, []*model.RunDetail{run1, run2}, runs, "Unexpected Run listed.")
 	assert.Empty(t, nextPageToken)
 }
 
@@ -331,30 +224,9 @@ func TestGetRun(t *testing.T) {
 	db, runStore := initializeRunStore()
 	defer db.Close()
 
-	expectedRun := &model.RunDetail{
-		Run: model.Run{
-			UUID:             "1",
-			Name:             "run1",
-			DisplayName:      "run1",
-			Namespace:        "n1",
-			CreatedAtInSec:   1,
-			ScheduledAtInSec: 1,
-			StorageState:     api.Run_STORAGESTATE_AVAILABLE.String(),
-			Conditions:       "Running",
-			ResourceReferences: []*model.ResourceReference{
-				{
-					ResourceUUID: "1", ResourceType: common.Run,
-					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
-				},
-			},
-		},
-		PipelineRuntime: model.PipelineRuntime{WorkflowRuntimeManifest: "workflow1"},
-	}
-
 	runDetail, err := runStore.GetRun("1")
 	assert.Nil(t, err)
-	assert.Equal(t, expectedRun, runDetail)
+	assert.Equal(t, run1, runDetail)
 }
 
 func TestGetRun_NotFoundError(t *testing.T) {
@@ -391,9 +263,9 @@ func TestCreateOrUpdateRun_UpdateSuccess(t *testing.T) {
 			Conditions:       "Running",
 			ResourceReferences: []*model.ResourceReference{
 				{
-					ResourceUUID: "1", ResourceType: common.Run,
+					ResourceUUID:  "1", ResourceType: common.Run,
 					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
+					Relationship:  common.Creator,
 				},
 			},
 		},
@@ -428,9 +300,9 @@ func TestCreateOrUpdateRun_UpdateSuccess(t *testing.T) {
 			Conditions:       "done",
 			ResourceReferences: []*model.ResourceReference{
 				{
-					ResourceUUID: "1", ResourceType: common.Run,
+					ResourceUUID:  "1", ResourceType: common.Run,
 					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
+					Relationship:  common.Creator,
 				},
 			},
 		},
@@ -559,9 +431,9 @@ func TestCreateOrUpdateRun_BadStorageStateValue(t *testing.T) {
 			Conditions:       "Running",
 			ResourceReferences: []*model.ResourceReference{
 				{
-					ResourceUUID: "1", ResourceType: common.Run,
+					ResourceUUID:  "1", ResourceType: common.Run,
 					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
+					Relationship:  common.Creator,
 				},
 			},
 		},
@@ -603,9 +475,9 @@ func TestTerminateRun(t *testing.T) {
 			Conditions:       "Terminating",
 			ResourceReferences: []*model.ResourceReference{
 				{
-					ResourceUUID: "1", ResourceType: common.Run,
+					ResourceUUID:  "1", ResourceType: common.Run,
 					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
+					Relationship:  common.Creator,
 				},
 			},
 		},
@@ -684,12 +556,12 @@ func TestGetRun_InvalidMetricPayload_Ignore(t *testing.T) {
 	sql, args, _ := sq.
 		Insert("run_metrics").
 		SetMap(sq.Eq{
-			"RunUUID":     "1",
+		"RunUUID":     "1",
-			"NodeID":      "node1",
+		"NodeID":      "node1",
-			"Name":        "accuracy",
+		"Name":        "accuracy",
-			"NumberValue": 0.88,
+		"NumberValue": 0.88,
-			"Format":      "RAW",
+		"Format":      "RAW",
-			"Payload":     "{ invalid; json,"}).ToSql()
+		"Payload":     "{ invalid; json,"}).ToSql()
 	db.Exec(sql, args...)
 
 	runDetail, err := runStore.GetRun("1")
@@ -725,8 +597,8 @@ func TestListRuns_WithMetrics(t *testing.T) {
 	runStore.ReportMetric(metric2)
 	runStore.ReportMetric(metric3)
 
-	expectedRuns := []*model.Run{
+	expectedRuns := []*model.RunDetail{
-		{
+		{Run: model.Run{
 			UUID:             "1",
 			Name:             "run1",
 			DisplayName:      "run1",
@@ -737,14 +609,18 @@ func TestListRuns_WithMetrics(t *testing.T) {
 			Conditions:       "Running",
 			ResourceReferences: []*model.ResourceReference{
 				{
-					ResourceUUID: "1", ResourceType: common.Run,
+					ResourceUUID:  "1", ResourceType: common.Run,
 					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
+					Relationship:  common.Creator,
 				},
 			},
 			Metrics: []*model.RunMetric{metric1, metric2},
 		},
-		{
+			PipelineRuntime: model.PipelineRuntime{
+				WorkflowRuntimeManifest: "workflow1",
+			},
+		},
+		{Run: model.Run{
 			UUID:             "2",
 			Name:             "run2",
 			DisplayName:      "run2",
@@ -755,13 +631,17 @@ func TestListRuns_WithMetrics(t *testing.T) {
 			Conditions:       "done",
 			ResourceReferences: []*model.ResourceReference{
 				{
-					ResourceUUID: "2", ResourceType: common.Run,
+					ResourceUUID:  "2", ResourceType: common.Run,
 					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
+					Relationship:  common.Creator,
 				},
 			},
 			Metrics: []*model.RunMetric{metric3},
 		},
+			PipelineRuntime: model.PipelineRuntime{
+				WorkflowRuntimeManifest: "workflow1",
+			},
+		},
 	}
 
 	opts, err := list.NewOptions(&model.Run{}, 2, "", nil)
@@ -854,8 +734,8 @@ func TestArchiveRun_IncludedInRunList(t *testing.T) {
 	assert.Nil(t, getRunErr)
 	assert.Equal(t, run.Run.StorageState, api.Run_STORAGESTATE_ARCHIVED.String())
 
-	expectedRuns := []*model.Run{
+	expectedRuns := []*model.RunDetail{
-		{
+		{Run: model.Run{
 			UUID:             "1",
 			Name:             "run1",
 			DisplayName:      "run1",
@@ -866,11 +746,15 @@ func TestArchiveRun_IncludedInRunList(t *testing.T) {
 			Conditions:       "Running",
 			ResourceReferences: []*model.ResourceReference{
 				{
-					ResourceUUID: "1", ResourceType: common.Run,
+					ResourceUUID:  "1", ResourceType: common.Run,
 					ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
-					Relationship: common.Creator,
+					Relationship:  common.Creator,
 				},
 			},
+		},
+			PipelineRuntime: model.PipelineRuntime{
+				WorkflowRuntimeManifest: "workflow1",
+			},
 		}}
 	opts, err := list.NewOptions(&model.Run{}, 1, "", nil)
 	runs, total_size, nextPageToken, err := runStore.ListRuns(