Skip to content

Commit b628862

Browse files
pascalchevrelpascalchevrel
committed
Merge branch 'beta_gtb_reschedule'
2 parents 638329f + 85b527a commit b628862

File tree

3 files changed

+61
-85
lines changed

3 files changed

+61
-85
lines changed

‎app/classes/ReleaseInsights/Release.php

Lines changed: 33 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public function getSchedule(string $pd_url = 'https://product-details.mozilla.or
7070
$nightly->modify('-1 day');
7171

7272
$x = match ($this->version) {
73+
// We keep some past releases as code examples
7374
'97.0' => 4,
7475
'110.0' => 4,
7576
default => 3,
@@ -80,32 +81,7 @@ public function getSchedule(string $pd_url = 'https://product-details.mozilla.or
8081
return is_object($day) ? $day->format('Y-m-d H:i:sP') : $nightly->modify($day)->format('Y-m-d H:i:sP');
8182
};
8283

83-
if ($this->version === '116.0') {
84-
$schedule = [
85-
'nightly_start' => $date($nightly),
86-
'qa_request_deadline' => $date('Friday 21:00'),
87-
'qa_feature_done_1' => $date('Friday +1 week 21:00'),
88-
'qa_feature_done_2' => $date($nightly->modify('+' . ($x - 2) . ' weeks')->modify('Wednesday 21:00')),
89-
'soft_code_freeze' => $date('Thursday 08:00'),
90-
'qa_pre_merge_done' => $date('Friday 14:00'),
91-
'string_freeze' => $date('Friday'),
92-
'merge_day' => $date('Tuesday'),
93-
'beta_1' => $date('Tuesday'),
94-
'beta_2' => $date('Thursday 21:00'),
95-
'sumo_1' => $date('Friday 21:00'),
96-
'beta_3' => $date('Sunday 21:00'),
97-
'beta_4' => $date('Tuesday 21:00'),
98-
'beta_5' => $date('Thursday 21:00'),
99-
'beta_6' => $date('Sunday 21:00'),
100-
'sumo_2' => $date('Monday 21:00'),
101-
'beta_7' => $date('Tuesday 21:00'),
102-
'qa_pre_rc_signoff' => $date('Wednesday 14:00'),
103-
'beta_8' => $date('Thursday 21:00'),
104-
'rc_gtb' => $date('Monday 21:00'),
105-
'rc' => $date('Tuesday'),
106-
'release' => $date($release->setTimezone(new \DateTimeZone('UTC'))),
107-
];
108-
} elseif ($this->version === '122.0') {
84+
if ($this->version === '122.0') {
10985
$schedule = [
11086
'nightly_start' => $date($nightly),
11187
'qa_request_deadline' => $date('Friday'),
@@ -116,24 +92,24 @@ public function getSchedule(string $pd_url = 'https://product-details.mozilla.or
11692
'string_freeze' => $date('Friday'),
11793
'merge_day' => $date('Monday'),
11894
'beta_1' => $date('Monday'),
119-
'beta_2' => $date('Tuesday 21:00'),
120-
'beta_3' => $date('Thursday 21:00'),
95+
'beta_2' => $date('Wednesday 13:00'),
96+
'beta_3' => $date('Friday 13:00'),
12197
'sumo_1' => $date('Friday 21:00'), // Friday of Beta week 1
122-
'beta_4' => $date('Thursday 21:00'),
123-
'beta_5' => $date('Tuesday 21:00'),
124-
'beta_6' => $date('Thursday 21:00'),
125-
'beta_7' => $date('Sunday 21:00'),
98+
'beta_4' => $date('next Friday 13:00'),
99+
'beta_5' => $date('Wednesday 13:00'),
100+
'beta_6' => $date('Friday 13:00'),
101+
'beta_7' => $date('Monday 13:00'),
126102
'sumo_2' => $date('Monday 21:00'), // Monday of Beta Week 3
127-
'beta_8' => $date('Tuesday 21:00'),
103+
'beta_8' => $date('Wednesday 13:00'),
128104
'qa_pre_rc_signoff' => $date('Wednesday 14:00'),
129-
'beta_9' => $date('Thursday 21:00'),
105+
'beta_9' => $date('Friday 13:00'),
130106
'rc_gtb' => $date('Monday 21:00'),
131107
'rc' => $date('Tuesday'),
132108
'release' => $date($release->setTimezone(new \DateTimeZone('UTC'))),
133109
];
134110
} else {
135111
$schedule = [
136-
'nightly_start' => $this->version === '117.0' ? $date('+1 day') : $date($nightly),
112+
'nightly_start' => $date($nightly),
137113
'qa_request_deadline' => $date('Friday'),
138114
'qa_feature_done_1' => $date('Friday +1 week 21:00'),
139115
'qa_feature_done_2' => $date($nightly->modify('+' . ($x - 2) . ' weeks')->modify('Wednesday 21:00')),
@@ -146,17 +122,17 @@ public function getSchedule(string $pd_url = 'https://product-details.mozilla.or
146122
default => $date('Monday'),
147123
},
148124
'beta_1' => $date('Monday'),
149-
'beta_2' => $date('Tuesday 21:00'),
150-
'beta_3' => $date('Thursday 21:00'),
125+
'beta_2' => $date('Wednesday 13:00'),
126+
'beta_3' => $date('Friday 13:00'),
151127
'sumo_1' => $date('Friday 21:00'), // Friday of Beta week 1
152-
'beta_4' => $date('Sunday 21:00'),
153-
'beta_5' => $date('Tuesday 21:00'),
154-
'beta_6' => $date('Thursday 21:00'),
155-
'beta_7' => $date('Sunday 21:00'),
128+
'beta_4' => $date('Monday 13:00'),
129+
'beta_5' => $date('Wednesday 13:00'),
130+
'beta_6' => $date('Friday 13:00'),
131+
'beta_7' => $date('Monday 13:00'),
156132
'sumo_2' => $date('Monday 21:00'), // Monday of Beta Week 3
157-
'beta_8' => $date('Tuesday 21:00'),
133+
'beta_8' => $date('Wednesday 13:00'),
158134
'qa_pre_rc_signoff' => $date('Wednesday 14:00'),
159-
'beta_9' => $date('Thursday 21:00'),
135+
'beta_9' => $date('Friday 13:00'),
160136
'rc_gtb' => $date('Monday 21:00'),
161137
'rc' => $date('Tuesday'),
162138
'release' => $date($release->setTimezone(new \DateTimeZone('UTC'))),
@@ -203,23 +179,23 @@ public static function getNiceLabel(string $version, string $label, bool $short=
203179
'string_freeze' => 'String Freeze' . ($short ? '' : ' starts'),
204180
'merge_day' => 'Merge day',
205181
'beta_1' => ($short ? '' : 'Firefox ') . $short_version . ' b1 GTB',
206-
'beta_2' => ($short ? '' : 'Firefox ') . $short_version . ' b2' . ($short ? ' GTB' : ' (GTB: 21:00 UTC)'),
207-
'beta_3' => ($short ? '' : 'Firefox ') . $short_version . ' b3' . ($short ? ' GTB' : ' (GTB: 21:00 UTC)'),
182+
'beta_2' => ($short ? '' : 'Firefox ') . $short_version . ' b2' . ($short ? ' GTB' : ' (GTB: 13:00 UTC)'),
183+
'beta_3' => ($short ? '' : 'Firefox ') . $short_version . ' b3' . ($short ? ' GTB' : ' (GTB: 13:00 UTC)'),
208184
'sumo_1' => 'SUMO deadline',
209-
'beta_4' => ($short ? '' : 'Firefox ') . $short_version . ' b4' . ($short ? ' GTB' : ' (GTB: 21:00 UTC)'),
210-
'beta_5' => ($short ? '' : 'Firefox ') . $short_version . ' b5' . ($short ? ' GTB' : ' (GTB: 21:00 UTC)'),
211-
'beta_6' => ($short ? '' : 'Firefox ') . $short_version . ' b6' . ($short ? ' GTB' : ' (GTB: 21:00 UTC)'),
212-
'beta_7' => ($short ? '' : 'Firefox ') . $short_version . ' b7' . ($short ? ' GTB' : ' (GTB: 21:00 UTC)'),
185+
'beta_4' => ($short ? '' : 'Firefox ') . $short_version . ' b4' . ($short ? ' GTB' : ' (GTB: 13:00 UTC)'),
186+
'beta_5' => ($short ? '' : 'Firefox ') . $short_version . ' b5' . ($short ? ' GTB' : ' (GTB: 13:00 UTC)'),
187+
'beta_6' => ($short ? '' : 'Firefox ') . $short_version . ' b6' . ($short ? ' GTB' : ' (GTB: 13:00 UTC)'),
188+
'beta_7' => ($short ? '' : 'Firefox ') . $short_version . ' b7' . ($short ? ' GTB' : ' (GTB: 13:00 UTC)'),
213189
'sumo_2' => 'SUMO content localization starts',
214-
'beta_8' => ($short ? '' : 'Firefox ') . $short_version . ' b8' . ($short ? ' GTB' : ' (GTB: 21:00 UTC)'),
190+
'beta_8' => ($short ? '' : 'Firefox ') . $short_version . ' b8' . ($short ? ' GTB' : ' (GTB: 13:00 UTC)'),
215191
'qa_pre_rc_signoff' => $short_version . ' QA sign off',
216-
'beta_9' => ($short ? '' : 'Firefox ') . $short_version . ' b9' . ($short ? ' GTB' : ' (GTB: 21:00 UTC)'),
217-
'beta_10' => ($short ? '' : 'Firefox ') . $short_version . ' b10' . ($short ? ' GTB' : ' (GTB: 21:00 UTC)'),
218-
'beta_11' => ($short ? '' : 'Firefox ') . $short_version . ' b11' . ($short ? ' GTB' : ' (GTB: 21:00 UTC)'),
219-
'beta_12' => ($short ? '' : 'Firefox ') . $short_version . ' b12' . ($short ? ' GTB' : ' (GTB: 21:00 UTC)'),
220-
'beta_13' => ($short ? '' : 'Firefox ') . $short_version . ' b13' . ($short ? ' GTB' : ' (GTB: 21:00 UTC)'),
221-
'beta_14' => ($short ? '' : 'Firefox ') . $short_version . ' b14' . ($short ? ' GTB' : ' (GTB: 21:00 UTC)'),
222-
'beta_15' => ($short ? '' : 'Firefox ') . $short_version . ' b15' . ($short ? ' GTB' : ' (GTB: 21:00 UTC)'),
192+
'beta_9' => ($short ? '' : 'Firefox ') . $short_version . ' b9' . ($short ? ' GTB' : ' (GTB: 13:00 UTC)'),
193+
'beta_10' => ($short ? '' : 'Firefox ') . $short_version . ' b10' . ($short ? ' GTB' : ' (GTB: 13:00 UTC)'),
194+
'beta_11' => ($short ? '' : 'Firefox ') . $short_version . ' b11' . ($short ? ' GTB' : ' (GTB: 13:00 UTC)'),
195+
'beta_12' => ($short ? '' : 'Firefox ') . $short_version . ' b12' . ($short ? ' GTB' : ' (GTB: 13:00 UTC)'),
196+
'beta_13' => ($short ? '' : 'Firefox ') . $short_version . ' b13' . ($short ? ' GTB' : ' (GTB: 13:00 UTC)'),
197+
'beta_14' => ($short ? '' : 'Firefox ') . $short_version . ' b14' . ($short ? ' GTB' : ' (GTB: 13:00 UTC)'),
198+
'beta_15' => ($short ? '' : 'Firefox ') . $short_version . ' b15' . ($short ? ' GTB' : ' (GTB: 13:00 UTC)'),
223199
'rc_gtb' => ($short ? '' : 'Firefox ') . $short_version . ' go to Build',
224200
'rc' => ($short ? '' : 'Firefox ') . 'RC',
225201
'release' => ($short ? '' : 'Firefox ') . $short_version . ($short ? ' Release' : ' go-live @ 6AM PT'),

‎app/models/ics_release_schedule.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@
2323
'string_freeze' => 'String Freeze starts',
2424
'merge_day' => 'Merge day',
2525
'beta_1' => 'Firefox ' . $releases['version'] . 'b1',
26-
'beta_2' => 'Firefox ' . $releases['version'] . 'b2 (GTB: 21:00 UTC)',
27-
'beta_3' => 'Firefox ' . $releases['version'] . 'b3 (GTB: 21:00 UTC)',
26+
'beta_2' => 'Firefox ' . $releases['version'] . 'b2 (GTB: 13:00 UTC)',
27+
'beta_3' => 'Firefox ' . $releases['version'] . 'b3 (GTB: 13:00 UTC)',
2828
'sumo_1' => 'User affecting changes provided to SUMO',
29-
'beta_4' => 'Firefox ' . $releases['version'] . 'b4 (GTB: 21:00 UTC)',
30-
'beta_5' => 'Firefox ' . $releases['version'] . 'b5 (GTB: 21:00 UTC)',
31-
'beta_6' => 'Firefox ' . $releases['version'] . 'b6 (GTB: 21:00 UTC)',
32-
'beta_7' => 'Firefox ' . $releases['version'] . 'b7 (GTB: 21:00 UTC)',
29+
'beta_4' => 'Firefox ' . $releases['version'] . 'b4 (GTB: 13:00 UTC)',
30+
'beta_5' => 'Firefox ' . $releases['version'] . 'b5 (GTB: 13:00 UTC)',
31+
'beta_6' => 'Firefox ' . $releases['version'] . 'b6 (GTB: 13:00 UTC)',
32+
'beta_7' => 'Firefox ' . $releases['version'] . 'b7 (GTB: 13:00 UTC)',
3333
'sumo_2' => 'SUMO content localization starts',
34-
'beta_8' => 'Firefox ' . $releases['version'] . 'b8 (GTB: 21:00 UTC)',
34+
'beta_8' => 'Firefox ' . $releases['version'] . 'b8 (GTB: 13:00 UTC)',
3535
'qa_pre_rc_signoff' => 'QA pre-release sign-off',
36-
'beta_9' => 'Firefox ' . $releases['version'] . 'b9 (GTB: 21:00 UTC)',
37-
'beta_10' => 'Firefox ' . $releases['version'] . 'b10 (GTB: 21:00 UTC)',
38-
'beta_11' => 'Firefox ' . $releases['version'] . 'b11 (GTB: 21:00 UTC)',
39-
'beta_12' => 'Firefox ' . $releases['version'] . 'b12 (GTB: 21:00 UTC)',
40-
'beta_13' => 'Firefox ' . $releases['version'] . 'b13 (GTB: 21:00 UTC)',
41-
'beta_14' => 'Firefox ' . $releases['version'] . 'b14 (GTB: 21:00 UTC)',
42-
'beta_15' => 'Firefox ' . $releases['version'] . 'b15 (GTB: 21:00 UTC)',
36+
'beta_9' => 'Firefox ' . $releases['version'] . 'b9 (GTB: 13:00 UTC)',
37+
'beta_10' => 'Firefox ' . $releases['version'] . 'b10 (GTB: 13:00 UTC)',
38+
'beta_11' => 'Firefox ' . $releases['version'] . 'b11 (GTB: 13:00 UTC)',
39+
'beta_12' => 'Firefox ' . $releases['version'] . 'b12 (GTB: 13:00 UTC)',
40+
'beta_13' => 'Firefox ' . $releases['version'] . 'b13 (GTB: 13:00 UTC)',
41+
'beta_14' => 'Firefox ' . $releases['version'] . 'b14 (GTB: 13:00 UTC)',
42+
'beta_15' => 'Firefox ' . $releases['version'] . 'b15 (GTB: 13:00 UTC)',
4343
'rc_gtb' => 'Firefox ' . $short_version . ' go to Build',
4444
'rc' => 'RC',
4545
'release' => 'Firefox ' . $short_version . ' go-live @ 6am PT',

‎app/views/templates/future_release.html.twig

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -188,23 +188,23 @@
188188
string_freeze: 'In order to ensure that our localizers have adequate time to translate strings, please make sure that all string changes have landed by end of day.',
189189
merge_day: 'This is the day in the release cycle when we merge mozilla-central into mozilla-beta. This is the end of the development cycle for Firefox ' ~ release ~ ' and the beginning of our Beta stabilization cycle.',
190190
beta_1: 'Built manually just after the merge. It is rolled out to 25% of our beta population. Some experimental features are still activated to watch their behavior on a wider population. These experimental features will be deactivated mid-cycle. Uplift requests are open.',
191-
beta_2: 'First automated beta of the cycle. It is rolled out to 50% of our beta population. Build starts at 21:00 UTC. <br>Stabilization work via uplifts.',
192-
beta_3: 'Beta rollout bumped to 100% provided stability is good. Build starts at 21:00 UTC. Stabilization work via uplifts.',
191+
beta_2: 'First automated beta of the cycle. It is rolled out to 50% of our beta population. Build starts at 13:00 UTC. <br>Stabilization work via uplifts.',
192+
beta_3: 'Beta rollout bumped to 100% provided stability is good. Build starts at 13:00 UTC. Stabilization work via uplifts.',
193193
sumo_1: 'User affecting changes were identified and provided to the support.mozilla.org team. The support content for this release can now be created and will be translated before RC week.',
194-
beta_4: 'Build starts at 21:00 UTC. Stabilization work via uplifts.',
195-
beta_5: 'Build starts at 21:00 UTC. Stabilization work via uplifts.',
196-
beta_6: 'On a regular 4 weeks beta cycle, Beta 6 is the last beta with experimental features still activated. Build starts at 21:00 UTC. Stabilization work via uplifts.',
197-
beta_7: 'Experimental features are no longer activated at compile time. Build starts at 21:00 UTC. Stabilization work via uplifts.',
198-
beta_8: 'Last week of the beta cycle. Build starts at 21:00 UTC. Stabilization work via uplifts.',
194+
beta_4: 'Build starts at 13:00 UTC. Stabilization work via uplifts.',
195+
beta_5: 'Build starts at 13:00 UTC. Stabilization work via uplifts.',
196+
beta_6: 'On a regular 4 weeks beta cycle, Beta 6 is the last beta with experimental features still activated. Build starts at 13:00 UTC. Stabilization work via uplifts.',
197+
beta_7: 'Experimental features are no longer activated at compile time. Build starts at 13:00 UTC. Stabilization work via uplifts.',
198+
beta_8: 'Last week of the beta cycle. Build starts at 13:00 UTC. Stabilization work via uplifts.',
199199
qa_pre_rc_signoff: 'A week before the final sign-off, QA shares preliminary test reports for each feature riding the train. This pre-release sign-off can be <abbr title="No quality concerns">Green</abbr>, <abbr title="Moderate quality concerns">Yellow</abbr> or <abbr title="Severe quality concerns">Red</abbr>.',
200-
beta_9: 'On a regular 4 weeks beta cycle, this is the last beta and thus the end of beta uplifts. Build starts at 21:00 UTC.',
200+
beta_9: 'On a regular 4 weeks beta cycle, this is the last beta and thus the end of beta uplifts. Build starts at 13:00 UTC.',
201201
sumo_2: 'New content on support.mozilla.org team is finalized, uploaded to the server and provided to our localization teams internationally.',
202-
beta_10: 'Extra beta usually due to a longer beta cycle. Build starts at 21:00 UTC. Stabilization work via uplifts.',
203-
beta_11: 'Extra beta usually due to a longer beta cycle. Build starts at 21:00 UTC. Stabilization work via uplifts.',
204-
beta_12: 'Extra beta usually due to a longer beta cycle. Build starts at 21:00 UTC. Stabilization work via uplifts.',
205-
beta_13: 'Extra beta usually due to a longer beta cycle. Build starts at 21:00 UTC. Stabilization work via uplifts.',
206-
beta_14: 'Extra beta usually due to a longer beta cycle. Build starts at 21:00 UTC. Stabilization work via uplifts.',
207-
beta_15: 'Extra beta usually due to a longer beta cycle. Build starts at 21:00 UTC. Stabilization work via uplifts.',
202+
beta_10: 'Extra beta usually due to a longer beta cycle. Build starts at 13:00 UTC. Stabilization work via uplifts.',
203+
beta_11: 'Extra beta usually due to a longer beta cycle. Build starts at 13:00 UTC. Stabilization work via uplifts.',
204+
beta_12: 'Extra beta usually due to a longer beta cycle. Build starts at 13:00 UTC. Stabilization work via uplifts.',
205+
beta_13: 'Extra beta usually due to a longer beta cycle. Build starts at 13:00 UTC. Stabilization work via uplifts.',
206+
beta_14: 'Extra beta usually due to a longer beta cycle. Build starts at 13:00 UTC. Stabilization work via uplifts.',
207+
beta_15: 'Extra beta usually due to a longer beta cycle. Build starts at 13:00 UTC. Stabilization work via uplifts.',
208208
rc_gtb: 'We merge our mozilla-beta repository to mozilla-release and close mozilla-beta until the next merge day. We then build our Release Candidate from mozilla-release. This is the build we intend to ship a week later unless we need to build a second Release Candidate to fix a major quality or business critical issue.',
209209
rc: 'Our Release Candidate is shipped to all of our beta population.',
210210
release: 'We ship Firefox ' ~ release ~ ' at ' ~ date(cycle_dates.release)|format_date(pattern='HH:mm', locale='en') ~ ' UTC (6AM PST) at 25% rollout.',

0 commit comments

Comments
 (0)