Skip to content

[WIP] TRT-2741: Add per-request BQ/PG toggle for Component Readiness #3797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mstaeble wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[WIP] TRT-2741: Add per-request BQ/PG toggle for Component Readiness #3797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51fc218
TRT-2741: Add per-request BQ/PG toggle for Component Readiness
mstaeble Jul 19, 2026
0ee6ce4
TRT-2741: Widen BQ modified_time filter to prevent excluding late-ing…
mstaeble Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/sippy/annotatejobruns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
bqprovider "github.com/openshift/sippy/pkg/api/componentreadiness/dataprovider/bigquery"
"github.com/openshift/sippy/pkg/apis/api/componentreport/crstatus"
"github.com/openshift/sippy/pkg/apis/api/componentreport/crtest"
"github.com/openshift/sippy/pkg/apis/api/componentreport/reqopts"
"github.com/openshift/sippy/pkg/apis/cache"
bqcachedclient "github.com/openshift/sippy/pkg/bigquery"
"github.com/openshift/sippy/pkg/bigquery/bqlabel"
Expand Down Expand Up @@ -180,7 +181,7 @@ Example run: sippy annotate-job-runs --google-service-account-credential-file=f
return errors.WithMessage(err, "couldn't get DB client")
}

allVariants, errs := componentreadiness.GetJobVariants(ctx, bqprovider.NewBigQueryProvider(bigQueryClient))
allVariants, errs := componentreadiness.GetJobVariants(ctx, bqprovider.NewBigQueryProvider(bigQueryClient), reqopts.RequestOptions{})
if len(errs) > 0 {
return fmt.Errorf("failed to get job variants: %v", errs)
}
Expand Down
3 changes: 2 additions & 1 deletion cmd/sippy/automatejira.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (

"github.com/openshift/sippy/pkg/api/componentreadiness"
"github.com/openshift/sippy/pkg/apis/api/componentreport/crtest"
"github.com/openshift/sippy/pkg/apis/api/componentreport/reqopts"
"github.com/openshift/sippy/pkg/apis/cache"
jiratype "github.com/openshift/sippy/pkg/apis/jira/v1"
bqcachedclient "github.com/openshift/sippy/pkg/bigquery"
Expand Down Expand Up @@ -168,7 +169,7 @@ func NewAutomateJiraCommand() *cobra.Command {
if err != nil {
return err
}
allVariants, errs := componentreadiness.GetJobVariants(ctx, provider)
allVariants, errs := componentreadiness.GetJobVariants(ctx, provider, reqopts.RequestOptions{})
if len(errs) > 0 {
return fmt.Errorf("failed to get job variants: %v", errs)
}
Expand Down
60 changes: 18 additions & 42 deletions pkg/api/componentreadiness/component_report.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package componentreadiness

import (
"context"
"encoding/json"
"fmt"
"maps"
"os"
Expand Down Expand Up @@ -65,9 +64,8 @@ func GetComponentTestVariants(ctx context.Context, provider dataprovider.DataPro
api.NewCacheSpec(generator, "TestVariants~", nil), generator.GenerateCacheVariants, CacheVariants{})
}

func GetJobVariants(ctx context.Context, provider dataprovider.DataProvider) (crtest.JobVariants,
[]error) {
return provider.QueryJobVariants(ctx)
func GetJobVariants(ctx context.Context, provider dataprovider.DataProvider, reqOptions reqopts.RequestOptions) (crtest.JobVariants, []error) {
return provider.QueryJobVariants(ctx, reqOptions)
}

func GetComponentReport(
Expand Down Expand Up @@ -195,6 +193,7 @@ type GeneratorCacheKey struct {
TestFilters reqopts.TestFilters
TestIDOptions []reqopts.TestIdentification
IncludeAllTests bool `json:"include_all_tests,omitempty"`
DataSource string
}

// GetCacheKey creates a cache key using the generator properties that we want included for uniqueness in what
Expand All @@ -210,6 +209,7 @@ func (c *ComponentReportGenerator) GetCacheKey() GeneratorCacheKey {
TestFilters: c.ReqOptions.TestFilters,
TestIDOptions: c.ReqOptions.TestIDOptions,
IncludeAllTests: c.ReqOptions.IncludeAllTests,
DataSource: c.ReqOptions.DataSource,
}

// TestIDOptions initialization differences caused many cache misses. This hacky bit of code attempts to handle
Expand Down Expand Up @@ -425,29 +425,22 @@ func goInterruptible(ctx context.Context, wg *sync.WaitGroup, closure func()) {
}()
}

var componentAndCapabilityGetter func(test crtest.KeyWithVariants, stats crstatus.TestStatus) (string, []string)
var componentAndCapabilityGetter func(stats crstatus.TestStatus) (string, []string)

func testToComponentAndCapability(_ crtest.KeyWithVariants, stats crstatus.TestStatus) (string, []string) {
func testToComponentAndCapability(stats crstatus.TestStatus) (string, []string) {
return stats.Component, stats.Capabilities
}

// getRowColumnIdentifications defines the rows and columns since they are variable. For rows, different pages have different row titles (component, capability etc)
// Columns titles depends on the columnGroupBy parameter user requests. A particular test can belong to multiple rows of different capabilities.
func (c *ComponentReportGenerator) getRowColumnIdentifications(testIDStr string, stats crstatus.TestStatus) ([]crtest.RowIdentification, []crtest.ColumnID, error) {
var test crtest.KeyWithVariants
func (c *ComponentReportGenerator) getRowColumnIdentifications(stats crstatus.TestStatus) ([]crtest.RowIdentification, []crtest.ColumnID) {
columnGroupByVariants := c.ReqOptions.VariantOption.ColumnGroupBy
// We show column groups by DBGroupBy only for the last page before test details
if len(c.ReqOptions.TestIDOptions) > 0 && c.ReqOptions.TestIDOptions[0].TestID != "" {
columnGroupByVariants = c.ReqOptions.VariantOption.DBGroupBy
}

// TODO: is this too slow?
err := json.Unmarshal([]byte(testIDStr), &test)
if err != nil {
return []crtest.RowIdentification{}, []crtest.ColumnID{}, err
}

testComponent, testCapabilities := componentAndCapabilityGetter(test, stats)
testComponent, testCapabilities := componentAndCapabilityGetter(stats)
rows := []crtest.RowIdentification{}
// First Page with no component requested
requestedComponent, requestedCapability, requestedTestID := "", "", ""
Expand All @@ -466,7 +459,7 @@ func (c *ComponentReportGenerator) getRowColumnIdentifications(testIDStr string,

row := crtest.RowIdentification{
Component: testComponent,
TestID: test.TestID,
TestID: stats.TestID,
TestName: stats.TestName,
TestSuite: stats.TestSuite,
}
Expand Down Expand Up @@ -494,18 +487,14 @@ func (c *ComponentReportGenerator) getRowColumnIdentifications(testIDStr string,

columns := []crtest.ColumnID{}
column := crtest.ColumnIdentification{Variants: map[string]string{}}
for key, value := range test.Variants {
for key, value := range stats.Variants {
if columnGroupByVariants.Has(key) {
column.Variants[key] = value
}
}
columnKeyBytes, err := json.Marshal(column)
if err != nil {
return []crtest.RowIdentification{}, []crtest.ColumnID{}, err
}
columns = append(columns, crtest.ColumnID(columnKeyBytes))
columns = append(columns, column.Encode())

return rows, columns, nil
return rows, columns
}

type cellStatus struct {
Expand Down Expand Up @@ -638,10 +627,7 @@ func (c *ComponentReportGenerator) generateComponentTestReport(basisStatusMap, s
if !sampleThere {
status = basisStatus
}
testKey, err := utils.DeserializeTestKey(status, testKeyStr)
if err != nil {
return crtype.ComponentReport{}, err
}
testKey := utils.DeserializeTestKey(status)

if !sampleThere {
// we use this to find tests associated with the basis that we don't see now in sample,
Expand All @@ -666,20 +652,14 @@ func (c *ComponentReportGenerator) generateComponentTestReport(basisStatusMap, s
}
}

rowIdentifications, columnIdentifications, err := c.getRowColumnIdentifications(testKeyStr, status)
if err != nil {
return crtype.ComponentReport{}, err
}
rowIdentifications, columnIdentifications := c.getRowColumnIdentifications(status)
updateCellStatus(
rowIdentifications, columnIdentifications, testKey, cellReport, includeAllTests, // inputs
aggregatedStatus, allRows, allColumns, // these three are maps to be updated
)
}

rows, err := buildReport(sortRowIdentifications(allRows), sortColumnIdentifications(allColumns), aggregatedStatus, includeAllTests)
if err != nil {
return crtype.ComponentReport{}, err
}
rows := buildReport(sortRowIdentifications(allRows), sortColumnIdentifications(allColumns), aggregatedStatus, includeAllTests)
return crtype.ComponentReport{Rows: rows}, nil
}

Expand Down Expand Up @@ -715,7 +695,7 @@ func sortColumnIdentifications(allColumns map[crtest.ColumnID]struct{}) []crtest
return sortedColumns
}

func buildReport(sortedRows []crtest.RowIdentification, sortedColumns []crtest.ColumnID, aggregatedStatus map[crtest.RowIdentification]map[crtest.ColumnID]cellStatus, includeAllTests bool) ([]crtype.ReportRow, error) {
func buildReport(sortedRows []crtest.RowIdentification, sortedColumns []crtest.ColumnID, aggregatedStatus map[crtest.RowIdentification]map[crtest.ColumnID]cellStatus, includeAllTests bool) []crtype.ReportRow {
// Now build the report
var regressionRows, goodRows []crtype.ReportRow
for _, rowID := range sortedRows {
Expand All @@ -729,11 +709,7 @@ func buildReport(sortedRows []crtest.RowIdentification, sortedColumns []crtest.C
if reportRow.Columns == nil {
reportRow.Columns = []crtype.ReportColumn{}
}
var colIDStruct crtest.ColumnIdentification
err := json.Unmarshal([]byte(columnID), &colIDStruct)
if err != nil {
return nil, err
}
colIDStruct := crtest.DecodeColumnID(columnID)
reportColumn := crtype.ReportColumn{ColumnIdentification: colIDStruct}
status, ok := columns[columnID]
if !ok {
Expand Down Expand Up @@ -766,7 +742,7 @@ func buildReport(sortedRows []crtest.RowIdentification, sortedColumns []crtest.C
}

regressionRows = append(regressionRows, goodRows...)
return regressionRows, nil
return regressionRows
}

func getRegressionStatus(basisPassPercentage, samplePassPercentage float64) crtest.Status {
Expand Down
Loading