From 3df6025716eaeee8da6f2a273433d208a8df8bf1 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Wed, 8 Mar 2023 09:37:43 +0100 Subject: [PATCH] [releng] - update substitutions Signed-off-by: Tomas Hrcka --- .../release_guide/pages/beta_RC_compose.adoc | 22 ++++++++++--------- modules/release_guide/pages/beta_release.adoc | 11 +++++----- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/modules/release_guide/pages/beta_RC_compose.adoc b/modules/release_guide/pages/beta_RC_compose.adoc index 904197a..c0a343c 100644 --- a/modules/release_guide/pages/beta_RC_compose.adoc +++ b/modules/release_guide/pages/beta_RC_compose.adoc @@ -23,6 +23,7 @@ Create fedora-beta.conf on the branched release branch, For inspiration look at . List any pre-existing builds in the current compose tag + +[source,subs="attributes+"] .... $ koji list-tagged f{branched}-compose .... @@ -40,6 +41,7 @@ listed under the compose tag. It is important to clear pre-existing builds from the compose tag when moving between the Beta and RC composes. Verify that these builds were removed. +[source,subs="attributes+"] .... $ koji list-tagged f{branched}-compose $ koji untag-build --all f{branched}-compose [build1 build2 ...] @@ -56,6 +58,7 @@ correctly. ==== . Add builds specified by QE to the current compose tag + +[source,subs="attributes+"] .... $ koji tag-build f{branched}-compose [build1 build2 ...] .... @@ -104,6 +107,7 @@ $ cd pungi-fedora If the clone step above was not required then fully update the existing repository checkout from pagure. + +[source,subs="attributes+"] .... $ git fetch origin $ git checkout f{branched} @@ -150,6 +154,7 @@ $ screen .... . Check the status of the compose + +[source,subs="attributes+"] .... $ cat /mnt/koji/compose/{branched}/[compose_id]/STATUS .... @@ -157,11 +162,13 @@ $ cat /mnt/koji/compose/{branched}/[compose_id]/STATUS Do not continue with any further steps if the output above is `DOOMED`. . Create the directory targeted for the copy : + +[source,subs="attributes+"] .... $ sudo -u ftpsync mkdir -m 750 -p /pub/alt/stage/{branched}_[release_label]-[#.#] .... . Locate the compose directory that will be the copy source : + +[source,subs="attributes+"] .... $ ls /mnt/koji/compose/{branched}/[compose_id] .... @@ -176,14 +183,16 @@ If in doubt, check /mnt/koji/compose/{branched}/[compose_id]/STATUS to be sure it is finished. ==== + . Run the synchronization one-liner + The synchronization of the completed compose to the public domain is currently a one-liner shell script. Pay close attention to what needs replaced in the example below. + +[source,subs="attributes+"] .... -$ sudo -u ftpsync sh -c 'for dir in Everything Cloud Container Kinoite Labs Modular Server Silverblue Spins Workstation metadata; do rsync -avhH /mnt/koji/compose/31/Fedora-31-20190911.0/compose/$dir/ /pub/alt/stage/31_Beta-1.1/$dir/ --link-dest=/pub/fedora/linux/development/31/Everything/ --link-dest=/pub/alt/stage/31_Beta-1.1/Everything/; done' +$ sudo -u ftpsync sh -c 'for dir in Everything Cloud Container Kinoite Labs Modular Server Silverblue Spins Workstation metadata; do rsync -avhH /mnt/koji/compose/{branched}/Fedora-{branched}-20190911.0/compose/$dir/ /pub/alt/stage/{branched}_Beta-1.1/$dir/ --link-dest=/pub/fedora/linux/development/{branched}/Everything/ --link-dest=/pub/alt/stage/{branched}_Beta-1.1/Everything/; done' .... + [NOTE] @@ -194,6 +203,7 @@ arguments above with multiple composes ==== . Set the permissions of the synced compose : + +[source,subs="attributes+"] .... $ sudo -u ftpsync chmod 755 /pub/alt/stage/{branched}_[release_label]-[#.#] .... @@ -201,16 +211,8 @@ $ sudo -u ftpsync chmod 755 /pub/alt/stage/{branched}_[release_label]-[#.#] + Once the compose and sync is complete the issue in pagure should be updated and closed. -+ -Standard Ticket Verbage -Compose is done and available from -https://kojipkgs.fedoraproject.org/compose/26/Fedora-26-20170328.0/compose/ -it has been synced to -http://dl.fedoraproject.org/pub/alt/stage/26_Alpha-1.4/ rpms have all be -hardlinked to /pub/fedora/linux/development/26/ - -===== Verification +==== Verification The method for verifying a compose has completed is checking `/mnt/koji/compose/{branched}/[compose_dir]/STATUS`. Any status diff --git a/modules/release_guide/pages/beta_release.adoc b/modules/release_guide/pages/beta_release.adoc index bd7ad80..e93fc2e 100644 --- a/modules/release_guide/pages/beta_release.adoc +++ b/modules/release_guide/pages/beta_release.adoc @@ -1,13 +1,12 @@ include::_partials/attributes.adoc[] == Fedora Beta Release +Based on the GO/NOGO meeting if the currnet compose is GO. The following steps need to be taken. +=== Koji chnages -=== Beta release - -==== Koji chnages - +[source,subs="attributes+"] .... -$ koji clone-tag --all --latest-only f31 f31-Beta -$ koji clone-tag --all --latest-only f31-modular f31-Beta-modular +$ koji clone-tag --all --latest-only f{branched} f{branched}-Beta +$ koji clone-tag --all --latest-only f{branched}-modular f{branched}-Beta-modular .... \ No newline at end of file