Merge pull request #2789 from yuqi-zhang/fix-candidate-reporting

Include candidate tier in default sippy queries for feature promotion

Author: openshift-merge-bot[bot]

tools/codegen/cmd/featuregate-test-analyzer.go

@@ -618,7 +618,7 @@ type JobVariant struct {
 	Topology     string
 	NetworkStack string
 	OS           string
-	JobTiers     string // Comma-separated tiers (e.g., "standard,informing,blocking"). If empty, defaults to "standard,informing,blocking"
+	JobTiers     string // Comma-separated tiers (e.g., "standard,informing,blocking"). If empty, defaults to "standard,informing,blocking,candidate"
 	Optional     bool   // If true, validation failures for this variant are non-blocking warnings
 }
 
@@ -680,7 +680,7 @@ func testResultByName(results []TestResults, testName string) *TestResults {
 
 func validateJobTiers(jobVariant JobVariant) error {
 	if jobVariant.JobTiers == "" {
-		return nil // Empty is valid - will default to standard,informing,blocking
+		return nil // Empty is valid - will default to standard,informing,blocking,candidate
 	}
 
 	validTiers := map[string]bool{

tools/codegen/cmd/featuregate-test-analyzer_test.go

@@ -6,6 +6,8 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/util/sets"
+
+	"github.com/openshift/api/tools/codegen/pkg/sippy"
 )
 
 func Test_listTestResultFor(t *testing.T) {
@@ -475,3 +477,42 @@ func Test_checkIfTestingIsSufficient_OptionalVariants(t *testing.T) {
 		})
 	}
 }
+
+func Test_defaultQueriesIncludeCandidateTier(t *testing.T) {
+	// When JobTiers is empty, QueriesFor should generate queries for all tiers
+	// including candidate. This test is added to prevent regressions for candidate-tier
+	// jobs being excluded, which is used by some TP jobs.
+	queries := sippy.QueriesFor("vsphere", "amd64", "ha", "", "", "", "FeatureGate:TestGate]")
+
+	tierNames := sets.New[string]()
+	for _, q := range queries {
+		tierNames.Insert(q.TierName)
+	}
+
+	expectedTiers := []string{"standard", "informing", "blocking", "candidate"}
+	for _, tier := range expectedTiers {
+		if !tierNames.Has(tier) {
+			t.Errorf("default queries missing tier %q - got tiers: %v", tier, sets.List(tierNames))
+		}
+	}
+}
+
+func Test_allRequiredVariantsQueryCandidateTier(t *testing.T) {
+	// Verify that all required variant definitions will query for the candidate
+	// tier, either explicitly via JobTiers or via the default.
+	allVariants := append(append([]JobVariant{}, requiredSelfManagedJobVariants...), requiredHypershiftJobVariants...)
+
+	for _, variant := range allVariants {
+		queries := sippy.QueriesFor(variant.Cloud, variant.Architecture, variant.Topology, variant.NetworkStack, variant.OS, variant.JobTiers, "FeatureGate:Test]")
+		hasCandidateQuery := false
+		for _, q := range queries {
+			if q.TierName == "candidate" {
+				hasCandidateQuery = true
+				break
+			}
+		}
+		if !hasCandidateQuery {
+			t.Errorf("variant %+v does not query candidate tier - some platforms only run TechPreview tests in candidate-tier jobs", variant)
+		}
+	}
+}

tools/codegen/pkg/sippy/json_types.go

@@ -101,10 +101,10 @@ func QueriesFor(cloud, architecture, topology, networkStack, os, jobTiers, testP
 		})
 	}
 
-	// Parse JobTiers - comma-separated string, default to standard/informing/blocking if empty
+	// Parse JobTiers - comma-separated string, default to standard/informing/blocking/candidate if empty
 	var jobTiersList []string
 	if jobTiers == "" {
-		jobTiersList = []string{"standard", "informing", "blocking"}
+		jobTiersList = []string{"standard", "informing", "blocking", "candidate"}
 	} else {
 		// Split by comma, trim whitespace, and deduplicate using sets
 		tierSet := sets.New[string]()
@@ -115,7 +115,7 @@ func QueriesFor(cloud, architecture, topology, networkStack, os, jobTiers, testP
 		}
 		// If all tiers were whitespace/empty after trimming, use defaults
 		if tierSet.Len() == 0 {
-			jobTiersList = []string{"standard", "informing", "blocking"}
+			jobTiersList = []string{"standard", "informing", "blocking", "candidate"}
 		} else {
 			jobTiersList = sets.List(tierSet)
 		}