Merge pull request #3982 from xmudrii/schdbuilder-dates

Use upcoming_releases dates for building the schedule

Author: k8s-ci-robot

cmd/schedule-builder/cmd/markdown.go

@@ -263,12 +263,46 @@ func updatePatchSchedule(refTime time.Time, schedule PatchSchedule, eolBranches
 			}
 
 			cherryPickDeadlinePlusOneMonth := cherryPickDeadline.AddDate(0, 1, 0)
-			cherryPickDay := firstFriday(cherryPickDeadlinePlusOneMonth)
-			newCherryPickDeadline := time.Date(cherryPickDeadlinePlusOneMonth.Year(), cherryPickDeadlinePlusOneMonth.Month(), cherryPickDay, 0, 0, 0, 0, time.UTC)
 
-			targetDatePlusOneMonth := targetDate.AddDate(0, 1, 0)
-			targetDateDay := secondTuesday(targetDatePlusOneMonth)
-			newTargetDate := time.Date(targetDatePlusOneMonth.Year(), targetDatePlusOneMonth.Month(), targetDateDay, 0, 0, 0, 0, time.UTC)
+			var (
+				newCherryPickDeadline time.Time
+				newTargetDate         time.Time
+				found                 bool
+			)
+
+			for _, u := range schedule.UpcomingReleases {
+				if u == nil {
+					continue
+				}
+
+				upcomingCherryPickDeadline, err := time.Parse(refDate, u.CherryPickDeadline)
+				if err != nil {
+					return fmt.Errorf("parse upcoming cherry pick deadline: %w", err)
+				}
+
+				if cherryPickDeadlinePlusOneMonth.Month() == upcomingCherryPickDeadline.Month() &&
+					cherryPickDeadlinePlusOneMonth.Year() == upcomingCherryPickDeadline.Year() {
+					newCherryPickDeadline = upcomingCherryPickDeadline
+
+					newTargetDate, err = time.Parse(refDate, u.TargetDate)
+					if err != nil {
+						return fmt.Errorf("parse upcoming release date: %w", err)
+					}
+
+					found = true
+
+					break
+				}
+			}
+
+			if !found {
+				cherryPickDay := firstFriday(cherryPickDeadlinePlusOneMonth)
+				newCherryPickDeadline = time.Date(cherryPickDeadlinePlusOneMonth.Year(), cherryPickDeadlinePlusOneMonth.Month(), cherryPickDay, 0, 0, 0, 0, time.UTC)
+
+				targetDatePlusOneMonth := targetDate.AddDate(0, 1, 0)
+				targetDateDay := secondTuesday(targetDatePlusOneMonth)
+				newTargetDate = time.Date(targetDatePlusOneMonth.Year(), targetDatePlusOneMonth.Month(), targetDateDay, 0, 0, 0, 0, time.UTC)
+			}
 
 			sched.Next = &PatchRelease{
 				Release:            nextReleaseVersion.String(),

cmd/schedule-builder/cmd/markdown_test.go

@@ -381,7 +381,7 @@ func TestUpdatePatchSchedule(t *testing.T) {
 				UpcomingReleases: []*PatchRelease{
 					{
 						CherryPickDeadline: "2024-03-08",
-						TargetDate:         "2024-03-13",
+						TargetDate:         "2024-03-12",
 					},
 					{
 						CherryPickDeadline: "2024-04-12",
@@ -399,8 +399,8 @@ func TestUpdatePatchSchedule(t *testing.T) {
 						Release: "1.30",
 						Next: &PatchRelease{
 							Release:            "1.30.4",
-							CherryPickDeadline: "2024-04-05",
-							TargetDate:         "2024-04-09",
+							CherryPickDeadline: "2024-04-12",
+							TargetDate:         "2024-04-17",
 						},
 						EndOfLifeDate:            "2025-01-01",
 						MaintenanceModeStartDate: "2024-12-01",