From 8211c644d572fc53a0f46e8d3a7582ede430d444 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Fri, 2 Aug 2024 13:06:37 +0200 Subject: [PATCH] Consistently use prep week The week prior to stabilization week is called prep week in Foreman's branching procedure. This aligns the schedule and Katello's branching procedure. --- procedures/katello/branch.md.erb | 2 +- schedule | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/procedures/katello/branch.md.erb b/procedures/katello/branch.md.erb index 260e448..ca18779 100644 --- a/procedures/katello/branch.md.erb +++ b/procedures/katello/branch.md.erb @@ -28,7 +28,7 @@ - [ ] Ensure that issues requiring installer changes are merged -# Two Weeks Prior to Branch Date: <%= two_weeks_before %> to <%= two_weeks_before + 4 %> +# Prep week: <%= two_weeks_before %> to <%= two_weeks_before + 4 %> ## Release Owner diff --git a/schedule b/schedule index ef2e59f..2ac6e1b 100755 --- a/schedule +++ b/schedule @@ -79,7 +79,7 @@ def main(): ('Event', 'Date'), ('Dev start', dev_start), ('Half way point', dev_start + ((branching - dev_start) / 2)), - ('Installer module release week', week_range(branching - relativedelta(weeks=2))), + ('Prep week', week_range(branching - relativedelta(weeks=2))), ('Stabilization week', week_range(branching - relativedelta(weeks=1))), ('Branching', branching), ('Release Candidate 1', branching),