From b7db91c4177c4fb0fa6b31d83ec551e20ba1e708 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 16 2023 13:41:30 +0000 Subject: *: Remove all '.Note' and '.Warning' Those elements are no longer needed. --- diff --git a/modules/release_guide/pages/beta_RC_compose.adoc b/modules/release_guide/pages/beta_RC_compose.adoc index c0a343c..285b77e 100644 --- a/modules/release_guide/pages/beta_RC_compose.adoc +++ b/modules/release_guide/pages/beta_RC_compose.adoc @@ -34,7 +34,6 @@ the output from the previous step. Consult the request ticket for the list of builds expected in this output. + [NOTE] -.Note ==== The very first run of an Beta, or GA compose should have no builds listed under the compose tag. It is important to clear pre-existing @@ -49,7 +48,6 @@ $ koji untag-build --all f{branched}-compose [build1 build2 ...] ==== + [NOTE] -.Note ==== The order in which packages are added into the f{branched}-compose tag matter. If the builds are untagged @@ -64,7 +62,6 @@ $ koji tag-build f{branched}-compose [build1 build2 ...] .... + [NOTE] -.Note ==== These steps may be completed on a local machine as long as the user has appropriate permissions in the koji tool. @@ -123,7 +120,6 @@ The numbering scheme begins with 1.1 and the second number is incremented after each compose. + [NOTE] -.Note ==== Pungi requires numbers in the format #.# as an argument. It is because of this that composes always start with the number 1 and the second @@ -131,7 +127,6 @@ number is incremented with each compose. ==== + [NOTE] -.Note ==== If the compose fails with a directory missing error, then create the compose directory with `mkdir /mnt/koji/compose/{branched}` @@ -174,7 +169,6 @@ $ ls /mnt/koji/compose/{branched}/[compose_id] .... + [NOTE] -.Note ==== Take care executing the synchronization if the next compose is already running. Be sure to grab the correct directory. @@ -196,7 +190,6 @@ $ sudo -u ftpsync sh -c 'for dir in Everything Cloud Container Kinoite Labs Modu .... + [NOTE] -.Note ==== If multiple composes are run like 1.2, 1.3, add multiple --link-dest arguments above with multiple composes diff --git a/modules/release_guide/pages/beta_freeze.adoc b/modules/release_guide/pages/beta_freeze.adoc index e8ad880..1a0b165 100644 --- a/modules/release_guide/pages/beta_freeze.adoc +++ b/modules/release_guide/pages/beta_freeze.adoc @@ -50,7 +50,6 @@ $ bodhi releases create --name F{branched}M --long-name "Fedora {branched} Modul Please update fas account username in above command. [WARNING] -.Warning ==== Due to a https://github.com/fedora-infra/bodhi/issues/2177[bug] in Bodhi, it is critical that Bodhi processes be restarted any time @@ -58,7 +57,6 @@ Bodhi, it is critical that Bodhi processes be restarted any time ==== [NOTE] -.Note ==== Add the container and flatpak releases if they weren't already added to bodhi @@ -132,7 +130,6 @@ During feezes we need to push to stable builds included in the compose. QA will file a ticket with the nvrs to push. [NOTE] -.Note ==== If you are pushing a bodhi update that contains multiple builds, you need only pass bodhi-push a single build nvr and all the others in that diff --git a/modules/release_guide/pages/beta_release.adoc b/modules/release_guide/pages/beta_release.adoc index 4cc33d4..987546b 100644 --- a/modules/release_guide/pages/beta_release.adoc +++ b/modules/release_guide/pages/beta_release.adoc @@ -21,8 +21,6 @@ $ sh scripts/stage-release.sh {branched}_Beta Fedora-{branched}-YYYYMMDD.0 _Beta Please update YYYYMMDD in the above command accordingly. [NOTE] -.Note - ==== Make sure to grab the directory size usage numbers which is used to send an email to [.title-ref]#mirror-admin@lists.fedoraproject.org# list. diff --git a/modules/release_guide/pages/contributing.adoc b/modules/release_guide/pages/contributing.adoc index d52e183..3ebe242 100644 --- a/modules/release_guide/pages/contributing.adoc +++ b/modules/release_guide/pages/contributing.adoc @@ -36,7 +36,6 @@ $ git remote add upstream https://pagure.io/releng.git ---- [NOTE] -.Note ==== If you are not currently familiar with git, it is highly recommended to visit git's upstream and familiarize yourself. diff --git a/modules/release_guide/pages/mass_rebuild.adoc b/modules/release_guide/pages/mass_rebuild.adoc index c116577..c81043c 100644 --- a/modules/release_guide/pages/mass_rebuild.adoc +++ b/modules/release_guide/pages/mass_rebuild.adoc @@ -81,7 +81,6 @@ maintainers: * How to opt out of the mass rebuild [NOTE,subs="attributes+"] -.Note ==== See https://fedoraproject.org/wiki/Fedora_{branched}_Mass_Rebuild[the Fedora {branched} Wiki example]. @@ -94,7 +93,6 @@ Send out the same information posted on the wiki to the [.title-ref]#devel-announce@lists.fedoraproject.org# mailing list. [NOTE] -.Note ==== See the template in releng repository https://pagure.io/releng/blob/main/f/mail-templates/01-mass-rebuild-start.txt[template]. @@ -130,7 +128,6 @@ $ koji add-target f{rawhide}-rebuild f{rawhide}-build .... [NOTE] -.Note ==== *koji add-target* _target-name_ _buildroot-tag_ _destination-tag_ describes the syntax format above. If the _destination-tag_ is not diff --git a/modules/release_guide/pages/overview.adoc b/modules/release_guide/pages/overview.adoc index 46cc1f2..4a26351 100644 --- a/modules/release_guide/pages/overview.adoc +++ b/modules/release_guide/pages/overview.adoc @@ -88,7 +88,6 @@ images, and other bits. These commands are named pungi and livecd-creator. [NOTE] -.Note ==== There is work currently being done to replace livecd-creator with https://github.com/rhinstaller/lorax/blob/master/src/sbin/livemedia-creator[livemedia-creator]. diff --git a/modules/release_guide/pages/sop_adding_build_targets.adoc b/modules/release_guide/pages/sop_adding_build_targets.adoc index a27157b..fed2fa8 100644 --- a/modules/release_guide/pages/sop_adding_build_targets.adoc +++ b/modules/release_guide/pages/sop_adding_build_targets.adoc @@ -89,7 +89,6 @@ koji add-target f17 f17-build .... [NOTE] -.Note ==== The `-pending` tags are used by https://fedoraproject.org/wiki/Bodhi[Bodhi] and diff --git a/modules/release_guide/pages/sop_adding_side_build_targets.adoc b/modules/release_guide/pages/sop_adding_side_build_targets.adoc index 720b608..712261f 100644 --- a/modules/release_guide/pages/sop_adding_side_build_targets.adoc +++ b/modules/release_guide/pages/sop_adding_side_build_targets.adoc @@ -20,7 +20,6 @@ The typical tag format is _PRODUCT_-_DESCRIPTOR_. The _DESCRIPTOR_ should be something brief that clearly shows why the tag exists. + [NOTE] -.Note ==== Don't think too hard about what makes a good descriptor. The descriptor for the XFCE version 4.8 side-build target was _xfce48_. KDE often @@ -47,7 +46,6 @@ $ koji taginfo f28-kde .... + [NOTE] -.Note ==== If the tag already exists, continue searching for an available tag by appending `-2` and incrementing the number by one until an available tag @@ -186,7 +184,6 @@ $ ./mass-tag.py --source --target > mass_tag.txt .... + [NOTE] -.Note ==== The _MAIN_TAG_NAME_ for Fedora is typically the pending subtag, e.g. `f28-pending` when bodhi is not managing updates. After bodhi is enabled diff --git a/modules/release_guide/pages/sop_bodhi_activation.adoc b/modules/release_guide/pages/sop_bodhi_activation.adoc index dab0069..7f78765 100644 --- a/modules/release_guide/pages/sop_bodhi_activation.adoc +++ b/modules/release_guide/pages/sop_bodhi_activation.adoc @@ -50,7 +50,6 @@ $ bodhi releases create --name F{branched}M --long-name "Fedora {branched} Modul Please update fas account username in above command. [WARNING] -.Warning ==== Due to a https://github.com/fedora-infra/bodhi/issues/2177[bug] in Bodhi, it is critical that Bodhi processes be restarted any time @@ -58,7 +57,6 @@ Bodhi, it is critical that Bodhi processes be restarted any time ==== [NOTE] -.Note ==== Add the container and flatpak releases if they weren't already added to bodhi diff --git a/modules/release_guide/pages/sop_branch_freeze.adoc b/modules/release_guide/pages/sop_branch_freeze.adoc index 75af952..9305884 100644 --- a/modules/release_guide/pages/sop_branch_freeze.adoc +++ b/modules/release_guide/pages/sop_branch_freeze.adoc @@ -14,7 +14,6 @@ that release and stop pushing updates. change freeze is going to happen at least one day in advance. [NOTE] -.Note ==== For updates pushers: In Change freeze only updates that fix accepted blockers or Freeze break bugs are allowed into the main tree. Please @@ -23,7 +22,6 @@ updates-testing. ==== [NOTE] -.Note ==== For Final/GA release: During Final freeze, we dont want to block any packages in koji as it will effect the RC composes. So, please update diff --git a/modules/release_guide/pages/sop_composing_fedora.adoc b/modules/release_guide/pages/sop_composing_fedora.adoc index da22869..b310bfd 100644 --- a/modules/release_guide/pages/sop_composing_fedora.adoc +++ b/modules/release_guide/pages/sop_composing_fedora.adoc @@ -48,7 +48,6 @@ the output from the previous step. Consult the request ticket for the list of builds expected in this output. + [NOTE] -.Note ==== The very first run of an Beta, or GA compose should have no builds listed under the compose tag. It is important to clear pre-existing @@ -62,7 +61,6 @@ $ koji untag-build --all f[release_version]-compose [build1 build2 ...] ==== + [NOTE] -.Note ==== The order in which packages are added into the f[release_version]-compose tag matter. If the builds are untagged @@ -76,7 +74,6 @@ $ koji tag-build f[release_version]-compose [build1 build2 ...] .... + [NOTE] -.Note ==== These steps may be completed on a local machine as long as the user has appropriate permissions in the koji tool. @@ -91,7 +88,6 @@ $ koji list-tagged f[release_version]-signing-pending .... + [NOTE] -.Note ==== If there are unsigned builds then wait for the automated queue to pick them up and sign them. Contact a member of the Fedora infrastructure @@ -150,7 +146,6 @@ The numbering scheme begins with 1.1 and the second number is incremented after each compose. + [NOTE] -.Note ==== Pungi requires numbers in the format #.# as an argument. It is because of this that composes always start with the number 1 and the second @@ -158,7 +153,6 @@ number is incremented with each compose. ==== + [NOTE] -.Note ==== If the compose fails with a directory missing error, then create the compose directory with `mkdir /mnt/koji/compose/[release_version]` @@ -198,7 +192,6 @@ $ ls /mnt/koji/compose/[release_version]/[compose_id] .... + [NOTE] -.Note ==== Take care executing the synchronization if the next compose is already running. Be sure to grab the correct directory. @@ -218,7 +211,6 @@ $ sudo -u ftpsync sh -c 'for dir in Everything Cloud Container Kinoite Labs Modu .... + [NOTE] -.Note ==== If multiple composes are run like 1.2, 1.3, add multiple --link-dest arguments above with multiple composes @@ -334,7 +326,6 @@ $ sudo ostree summary -u .... [NOTE] -.Note ==== Before pushing the updates to fxx-updates, run the last branched compose so that both branched and rc composes have the same content. Once the @@ -579,7 +570,6 @@ $ sh scripts/stage-release.sh 32 Fedora-32-20200415.0 32_RC-1.1 fedora-32 0 .... [NOTE] -.Note ==== Make sure to grab the directory size usage numbers which is used to send an email to [.title-ref]#mirror-admin@lists.fedoraproject.org# list. diff --git a/modules/release_guide/pages/sop_create_release_signing_key.adoc b/modules/release_guide/pages/sop_create_release_signing_key.adoc index 1a60697..3623010 100644 --- a/modules/release_guide/pages/sop_create_release_signing_key.adoc +++ b/modules/release_guide/pages/sop_create_release_signing_key.adoc @@ -92,7 +92,6 @@ $ sigul grant-key-access fedora-{branched} kevin .... [NOTE] -.Note ==== *IMPORTANT:* Grant the access to autopen user as it's required for robosignatory autosigning and then restart robosignatory service diff --git a/modules/release_guide/pages/sop_deprecate_ftbfs_packages.adoc b/modules/release_guide/pages/sop_deprecate_ftbfs_packages.adoc index d2416a1..1b01625 100644 --- a/modules/release_guide/pages/sop_deprecate_ftbfs_packages.adoc +++ b/modules/release_guide/pages/sop_deprecate_ftbfs_packages.adoc @@ -3,7 +3,6 @@ === Description [NOTE] -.Note ==== FTBFS = "Fails To Build From Source" ==== diff --git a/modules/release_guide/pages/sop_end_of_life.adoc b/modules/release_guide/pages/sop_end_of_life.adoc index edd3931..cc504a1 100644 --- a/modules/release_guide/pages/sop_end_of_life.adoc +++ b/modules/release_guide/pages/sop_end_of_life.adoc @@ -105,7 +105,6 @@ $ bodhi releases edit --name "F31F" --state archived .... [WARNING] -.Warning ==== Due to a https://github.com/fedora-infra/bodhi/issues/2177[bug] in Bodhi, it is critical that Bodhi processes be restarted any time diff --git a/modules/release_guide/pages/sop_file_ftbfs.adoc b/modules/release_guide/pages/sop_file_ftbfs.adoc index df11054..9b65928 100644 --- a/modules/release_guide/pages/sop_file_ftbfs.adoc +++ b/modules/release_guide/pages/sop_file_ftbfs.adoc @@ -3,7 +3,6 @@ === Description [NOTE] -.Note ==== FTBFS = "Fails To Build From Source" ==== @@ -46,7 +45,6 @@ Update the [.title-ref]#massrebuildsinfo.py#:: * tracking_bug + [NOTE] - .Note ==== Most of these values are already updated during mass rebuild, only one that might need updating is [.title-ref]#tracking_bug# @@ -64,7 +62,6 @@ $ bugzilla login .... + [NOTE] - .Note ==== Login as [.title-ref]#releng@fedoraproject.org# ==== diff --git a/modules/release_guide/pages/sop_mass_rebuild_modules.adoc b/modules/release_guide/pages/sop_mass_rebuild_modules.adoc index 569347f..8b183a8 100644 --- a/modules/release_guide/pages/sop_mass_rebuild_modules.adoc +++ b/modules/release_guide/pages/sop_mass_rebuild_modules.adoc @@ -96,7 +96,6 @@ $ ./mass-rebuild-modules.py build --wait 2>&1 | tee ~/massb ____ [NOTE] -.Note ==== The token file should be located in infra's private ansible repo, or ask infra to get it to you using this @@ -104,7 +103,6 @@ https://pagure.io/fedora-infrastructure/issue/8048#comment-587789[process]. ==== [NOTE] -.Note ==== The [.title-ref]#build# option is really important to pay attention, since the mass branching of modules will also use the same script, just diff --git a/modules/release_guide/pages/sop_mass_rebuild_packages.adoc b/modules/release_guide/pages/sop_mass_rebuild_packages.adoc index 606a906..9cf3ca8 100644 --- a/modules/release_guide/pages/sop_mass_rebuild_packages.adoc +++ b/modules/release_guide/pages/sop_mass_rebuild_packages.adoc @@ -53,7 +53,6 @@ maintainers: * How to opt out of the mass rebuild [NOTE] -.Note ==== See https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild[the Fedora 26 Wiki example]. @@ -66,7 +65,6 @@ Send out the same information posted on the wiki to the [.title-ref]#devel-announce@lists.fedoraproject.org# mailing list. [NOTE] -.Note ==== See https://lists.fedoraproject.org/archives/list/devel-announce@lists.fedoraproject.org/message/QAMEEWUG7ND5E7LQYXQSQLRUDQPSBINA/[the @@ -101,7 +99,6 @@ $ koji add-target f26-rebuild f26-build .... [NOTE] -.Note ==== *koji add-target* _target-name_ _buildroot-tag_ _destination-tag_ describes the syntax format above. If the _destination-tag_ is not