From 9f9c2dd3488a78a65b8c79e51b9efb187e7a9460 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 13 Sep 2024 14:43:56 -0700 Subject: [PATCH] release candidate SOP: update args, improve some comments The main change here is to update the args for the script to be correct after https://pagure.io/pungi-fedora/pull-request/1369 . Also, we explain that the compose request might include commands for untagging/tagging builds (this feature was added a few months ago), and extend/clarify the comments on the label format. Signed-off-by: Adam Williamson --- .../release_guide/pages/beta_RC_compose.adoc | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/modules/release_guide/pages/beta_RC_compose.adoc b/modules/release_guide/pages/beta_RC_compose.adoc index 147d2c9..51310a9 100644 --- a/modules/release_guide/pages/beta_RC_compose.adoc +++ b/modules/release_guide/pages/beta_RC_compose.adoc @@ -36,7 +36,10 @@ $ koji list-tagged f{branched}-compose + The tagged builds from the previous composes should all be present in the output from the previous step. Consult the request ticket for the -list of builds expected in this output. +list of builds expected in this output. The request ticket may list +commands to un-tag existing tagged builds and tag the new requested +builds; if so, you can review these commands and run them. Otherwise, +the steps to do this manually are documented below. + [NOTE] ==== @@ -118,17 +121,21 @@ $ git pull origin f{branched} . Run the compose + .... -$ sudo ./release-candidate.sh 41_Beta-#.# +$ sudo ./release-candidate.sh 41 Beta-#.# .... + -The numbering scheme begins with 1.1 and the second number is -incremented after each compose. +The first argument is the release number. The second argument is the +compose label. The numbering scheme begins with 1.1 and the second +number is incremented after each compose. The first number always +remains at 1 for Fedora composes. + [NOTE] ==== -Pungi requires numbers in the format `major.minor` as an argument (e.g. `1.4`). -It is because of this that composes always start with the number 1 and the second -number is incremented with each compose. +productmd requires the label version to be in this format (because +both numbers may be incremented for other products that use productmd +metadata, and have different meanings). It is because of this that +composes always start with the number 1 and the second number is +incremented with each compose. ==== + [NOTE]