From c390f1dd7ef6f458fff9064c82f3804581de07a9 Mon Sep 17 00:00:00 2001 From: teor Date: Thu, 15 Nov 2018 12:05:28 +1000 Subject: [PATCH 1/4] doc: Add a new Travis CI cron job when there's a new maint branch Part of 28453. --- doc/HACKING/ReleasingTor.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 4c87a366cc..c7cd0bc111 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -240,7 +240,11 @@ new Tor release: `maint-x.y.z` branch to "newversion-dev", and do a `merge -s ours` merge to avoid taking that change into master. -2. Forward-port the ChangeLog (and ReleaseNotes if appropriate) to the +2. If there is a new `maint-x.y.z` branch, create a Travis CI cron job that + builds the release every week. (It's ok to skip the weekly build if the + branch was updated in the last 24 hours.) + +3. Forward-port the ChangeLog (and ReleaseNotes if appropriate) to the master branch. -3. Keep an eye on the blog post, to moderate comments and answer questions. +4. Keep an eye on the blog post, to moderate comments and answer questions. From 6263d9e13f51d7f4f077034cb7701ba530c4fd6c Mon Sep 17 00:00:00 2001 From: teor Date: Thu, 15 Nov 2018 12:06:29 +1000 Subject: [PATCH 2/4] doc: Add End of Life Tor instructions Closes 28453. --- doc/HACKING/EndOfLifeTor.md | 52 +++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 doc/HACKING/EndOfLifeTor.md diff --git a/doc/HACKING/EndOfLifeTor.md b/doc/HACKING/EndOfLifeTor.md new file mode 100644 index 0000000000..36150bca6d --- /dev/null +++ b/doc/HACKING/EndOfLifeTor.md @@ -0,0 +1,52 @@ + +End of Life on an old release series +------------------------------------ + +Here are the steps that the maintainer should take when an old Tor release +series reaches End of Life: + +=== 0. Preliminaries + +0. A few months before End of Life: + Write a deprecation announcement. + Send the announcement out with every new release announcement. + +1. A month before End of Life: + Send the announcement to tor-announce, tor-talk, tor-relays, and the + packagers. + +2. A few days before End of Life: + Get at least two of weasel/arma/Sebastian to + remove the old version number from their approved versions list. + Give them a few days to do this if you can. + +=== 1. On the day + +1. Open tickets to remove the release from: + - the jenkins builds + - tor's Travis CI cron jobs + - chutney's Travis CI tests (#) + - stem's Travis CI tests (#) + +2. Close the milestone in Trac. To do this, go to Trac, log in, + select "Admin" near the top of the screen, then select "Milestones" from + the menu on the left. Click on the milestone for this version, and + select the "Completed" checkbox. By convention, we select the date as + the End of Life date. + +3. Replace NNN-backport with NNN-unreached-backport in all open trac tickets. + +4. If there are any remaining tickets in the milestone: + - merge_ready tickets are for backports: + - if there are no supported releases for the backport, close the ticket + - if there is an earlier (LTS) release for the backport, move the ticket + to that release + - other tickets should be closed (if we won't fix them) or moved to a + supported release (if we will fix them) + +5. Double-check: did the version get un-recommended in the consensus yet? + If not, don't announce until they have the up-to-date versions, or people + will get confused. + +6. Mail the end of life announcement to tor-announce, the packagers list, + and tor-relays. The current list of packagers is in ReleasingTor.md. From 3ba2e04ee7ee74d20a76536b195833caf227cc32 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 30 May 2019 09:05:35 -0400 Subject: [PATCH 3/4] Minor tweaks on EOL process First, clarify that this is for planned deprecations, not security-related issues. Second, we actually _don't_ want to remove the versions from the approved list before the EOL date, or people will start getting warnings too early. --- doc/HACKING/EndOfLifeTor.md | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/doc/HACKING/EndOfLifeTor.md b/doc/HACKING/EndOfLifeTor.md index 36150bca6d..502b862fc9 100644 --- a/doc/HACKING/EndOfLifeTor.md +++ b/doc/HACKING/EndOfLifeTor.md @@ -3,7 +3,9 @@ End of Life on an old release series ------------------------------------ Here are the steps that the maintainer should take when an old Tor release -series reaches End of Life: +series reaches End of Life. Note that they are _only_ for entire series that +have reached their planned EOL: they do not apply to security-related +deprecations of individual versions. === 0. Preliminaries @@ -15,11 +17,6 @@ series reaches End of Life: Send the announcement to tor-announce, tor-talk, tor-relays, and the packagers. -2. A few days before End of Life: - Get at least two of weasel/arma/Sebastian to - remove the old version number from their approved versions list. - Give them a few days to do this if you can. - === 1. On the day 1. Open tickets to remove the release from: @@ -44,9 +41,8 @@ series reaches End of Life: - other tickets should be closed (if we won't fix them) or moved to a supported release (if we will fix them) -5. Double-check: did the version get un-recommended in the consensus yet? - If not, don't announce until they have the up-to-date versions, or people - will get confused. - -6. Mail the end of life announcement to tor-announce, the packagers list, +5. Mail the end of life announcement to tor-announce, the packagers list, and tor-relays. The current list of packagers is in ReleasingTor.md. + +6. Get at least two of weasel/arma/Sebastian to remove the old version number + from their approved versions list. From d41427b054e981152659754ef2b1ee44bb76d722 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 30 May 2019 09:07:45 -0400 Subject: [PATCH 4/4] A couple of suggestions from dgoulet on EndOfLife.md --- doc/HACKING/EndOfLifeTor.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/HACKING/EndOfLifeTor.md b/doc/HACKING/EndOfLifeTor.md index 502b862fc9..c7492f0ca0 100644 --- a/doc/HACKING/EndOfLifeTor.md +++ b/doc/HACKING/EndOfLifeTor.md @@ -44,5 +44,7 @@ deprecations of individual versions. 5. Mail the end of life announcement to tor-announce, the packagers list, and tor-relays. The current list of packagers is in ReleasingTor.md. -6. Get at least two of weasel/arma/Sebastian to remove the old version number - from their approved versions list. +6. Ask at least two of weasel/arma/Sebastian to remove the old version + number from their approved versions list. + +7. Update the CoreTorReleases wiki page.