Merge pull request #2285 from neisw/trt-2080-dev-branch-awareness

trt-2080: check devlopment start date for latest release

Author: openshift-merge-bot[bot]

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

@@ -464,7 +464,7 @@ func testResultByName(results []TestResults, testName string) *TestResults {
 }
 
 func listTestResultFor(featureGate string, clusterProfiles sets.Set[string]) (map[JobVariant]*TestingResults, error) {
-	fmt.Printf("Query component readiness for all test run results for feature gate %q on clusterProfile %q\n", featureGate, sets.List(clusterProfiles))
+	fmt.Printf("Query sippy for all test run results for feature gate %q on clusterProfile %q\n", featureGate, sets.List(clusterProfiles))
 
 	results := map[JobVariant]*TestingResults{}
 
@@ -533,6 +533,10 @@ func getLatestRelease() (string, error) {
 
 	var result struct {
 		Releases []string `json:"releases"`
+		Dates    map[string]struct {
+			GA               *time.Time `json:"ga,omitempty"`
+			DevelopmentStart *time.Time `json:"development_start,omitempty"`
+		} `json:"dates"`
 	}
 	err = json.Unmarshal(body, &result)
 	if err != nil {
@@ -543,7 +547,15 @@ func getLatestRelease() (string, error) {
 		return "", fmt.Errorf("no releases found")
 	}
 
-	return result.Releases[0], nil
+	for _, release := range result.Releases {
+		if dates, ok := result.Dates[release]; ok {
+			if dates.DevelopmentStart != nil && !dates.DevelopmentStart.IsZero() && time.Now().After(*dates.DevelopmentStart) {
+				return release, nil
+			}
+		}
+	}
+
+	return "", fmt.Errorf("no valid development releases found")
 }
 
 func listTestResultForVariant(featureGate string, jobVariant JobVariant) (*TestingResults, error) {
@@ -555,7 +567,7 @@ func listTestResultForVariant(featureGate string, jobVariant JobVariant) (*Testi
 		testPattern = fmt.Sprintf("install should succeed")
 	}
 
-	fmt.Printf("Query component readiness for all test run results for pattern %q on variant %#v\n", testPattern, jobVariant)
+	fmt.Printf("Query sippy for all test run results for pattern %q on variant %#v\n", testPattern, jobVariant)
 
 	defaultTransport := &http.Transport{
 		Proxy:                 http.ProxyFromEnvironment,
@@ -576,29 +588,28 @@ func listTestResultForVariant(featureGate string, jobVariant JobVariant) (*Testi
 
 	testNameToResults := map[string]*TestResults{}
 	queries := sippy.QueriesFor(jobVariant.Cloud, jobVariant.Architecture, jobVariant.Topology, jobVariant.NetworkStack, testPattern)
+	var release string
+	// if its not main branch, then use the ENV var to determine the release version
+	currentRelease := os.Getenv("PULL_BASE_REF")
+	if strings.Contains(currentRelease, "release-") {
+		// example: release-4.18, release-4.17
+		release = strings.TrimPrefix(currentRelease, "release-")
+	} else {
+		// means its main branch
+		var err error
+		release, err = getLatestRelease()
+		if err != nil {
+			return nil, fmt.Errorf("couldn't fetch latest release version: %w", err)
+		}
+	}
+	fmt.Printf("Querying sippy release %s for test run results\n", release)
+
 	for _, currQuery := range queries {
 		currURL := &url.URL{
 			Scheme: "https",
 			Host:   "sippy.dptools.openshift.org",
 			Path:   "api/tests",
 		}
-		var release string
-		// if its not main branch, then use the ENV var to determine the release version
-		currentRelease := os.Getenv("PULL_BASE_REF")
-		if strings.Contains(currentRelease, "release-") {
-			// example: release-4.18, release-4.17
-			release = strings.TrimPrefix(currentRelease, "release-")
-		} else {
-			// Temporary until branching on 2025-04-18, or we find a way to fix sippy to return the dev branch sooner.
-			release = "4.19"
-
-			// means its main branch
-			// var err error
-			// release, err = getLatestRelease()
-			// if err != nil {
-			// 	return nil, fmt.Errorf("couldn't fetch latest release version: %w", err)
-			// }
-		}
 		queryParams := currURL.Query()
 		queryParams.Add("release", release)
 		queryParams.Add("period", "default")