From 5dc71254e20ac8fb644c4dd53e40cdead51cc0a9 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 26 Nov 2024 09:50:45 -0800 Subject: [PATCH] EOL SOP: make commands easier to copy/paste Drop all the $ prefixes and in-line comments to make the commands easier to copy/paste. Also fix up the koji_cleanup_signed instructions a bit. Signed-off-by: Adam Williamson --- modules/release_guide/pages/release_eol.adoc | 135 ++++++++++--------- 1 file changed, 70 insertions(+), 65 deletions(-) diff --git a/modules/release_guide/pages/release_eol.adoc b/modules/release_guide/pages/release_eol.adoc index 455f41a..38f6d02 100644 --- a/modules/release_guide/pages/release_eol.adoc +++ b/modules/release_guide/pages/release_eol.adoc @@ -40,13 +40,13 @@ This is not necessary if the package already has the correct EOL date. [source,subs="attributes+"] .... -$ koji remove-target f{old_release} -$ koji remove-target f{old_release}-candidate -$ koji remove-target f{old_release}-container-candidate -$ koji remove-target f{old_release}-flatpak-candidate -$ koji remove-target f{old_release}-infra -$ koji remove-target f{old_release}-coreos-continuous -$ koji remove-target f{old_release}-rebuild +koji remove-target f{old_release} +koji remove-target f{old_release}-candidate +koji remove-target f{old_release}-container-candidate +koji remove-target f{old_release}-flatpak-candidate +koji remove-target f{old_release}-infra +koji remove-target f{old_release}-coreos-continuous +koji remove-target f{old_release}-rebuild .... * Remove sidetags @@ -66,9 +66,9 @@ a sidetag will leave it in a weird state where it cannot be removed. * Purge from disk the signed copies of rpms that are signed with the -EOL'd release key. To acheive this, add the release key to +EOL'd release key. To achieve this, add the release key to *koji_cleanup_signed.py* script in https://pagure.io/releng[releng] repo -and the script on compose-branched01.iad2.fedoraproject.org +and run the script on compose-branched01.iad2.fedoraproject.org: .... ./scripts/koji_cleanup_signed.py @@ -86,9 +86,9 @@ Run the following bodhi commands to set the releases state to [source,subs="attributes+"] .... -$ bodhi releases edit --name "F{old_release}" --state archived -$ bodhi releases edit --name "F{old_release}C" --state archived -$ bodhi releases edit --name "F{old_release}F" --state archived +bodhi releases edit --name "F{old_release}" --state archived +bodhi releases edit --name "F{old_release}C" --state archived +bodhi releases edit --name "F{old_release}F" --state archived .... === Fedora Infra Ansible Changes @@ -109,12 +109,12 @@ and set the release to status "EOL". First, push the above edits. Then run the associated playbooks on _batcave01_: .... -$ sudo ansible-playbook /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml -$ sudo ansible-playbook /srv/web/infra/ansible/playbooks/groups/koji-hub.yml -$ sudo ansible-playbook /srv/web/infra/ansible/playbooks/groups/releng-compose.yml -$ sudo ansible-playbook /srv/web/infra/ansible/playbooks/groups/proxies.yml -t pkgdb2 -$ sudo ansible-playbook /srv/web/infra/ansible/playbooks/manual/autosign.yml -$ sudo ansible-playbook /srv/web/infra/ansible/playbooks/openshift-apps/bodhi.yml +sudo ansible-playbook /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml +sudo ansible-playbook /srv/web/infra/ansible/playbooks/groups/koji-hub.yml +sudo ansible-playbook /srv/web/infra/ansible/playbooks/groups/releng-compose.yml +sudo ansible-playbook /srv/web/infra/ansible/playbooks/groups/proxies.yml -t pkgdb2 +sudo ansible-playbook /srv/web/infra/ansible/playbooks/manual/autosign.yml +sudo ansible-playbook /srv/web/infra/ansible/playbooks/openshift-apps/bodhi.yml .... [NOTE] @@ -131,47 +131,46 @@ Use the https://pagure.io/releng/blob/main/f/mail-templates/08-end-of-life.txt[t ==== stage the EOL release to archive -. Log into to bodhi-backend01 and become root +. Log into to bodhi-backend01 and become ftpsync, via root + ____ .... -$ ssh bodhi-backend01.iad2.fedoraproject.org -$ sudo su -$ su - ftpsync +ssh bodhi-backend01.iad2.fedoraproject.org +sudo su +su - ftpsync .... ____ . Then change into the releases directory. + ____ .... -$ cd /pub/fedora/linux/releases +cd /pub/fedora/linux/releases .... ____ -. Check to see that the target directory doesnt already exist. +. Check to see that the target directory doesn't already exist. + ____ .... -$ ls /pub/archive/fedora/linux/releases/ +ls /pub/archive/fedora/linux/releases/ .... ____ -. Do a recursive rsync to update any changes in the trees since the previous -copy. +. Do a recursive rsync to update any changes in the trees since the previous copy. + ____ [source,subs="attributes+"] .... -$ rsync -avAXSHP ./{old_release}/ /pub/archive/fedora/linux/releases/{old_release}/ +rsync -avAXSHP ./{old_release}/ /pub/archive/fedora/linux/releases/{old_release}/ .... ____ -. We will now do the updates and updates/testing in similar ways. +. Similarly, sync updates and updates/testing. + ____ [source,subs="attributes+"] .... -$ cd ../updates/ -$ rsync -avAXSHP {old_release}/ /pub/archive/fedora/linux/updates/{old_release}/ -$ cd testing -$ rsync -avAXSHP {old_release}/ /pub/archive/fedora/linux/updates/testing/{old_release}/ +cd ../updates/ +rsync -avAXSHP {old_release}/ /pub/archive/fedora/linux/updates/{old_release}/ +cd testing +rsync -avAXSHP {old_release}/ /pub/archive/fedora/linux/updates/testing/{old_release}/ .... ____ . Do the same with fedora-secondary. @@ -179,12 +178,12 @@ ____ ____ [source,subs="attributes+"] .... -$ cd /pub/fedora-secondary/releases/ -$ rsync -avAXSHP ./{old_release}/ /pub/archive/fedora-secondary/releases/{old_release}/ -$ cd ../updates/ -$ rsync -avAXSHP {old_release}/ /pub/archive/fedora-secondary/updates/{old_release}/ -$ cd testing -$ rsync -avAXSHP {old_release}/ /pub/archive/fedora-secondary/updates/testing/{old_release}/ +cd /pub/fedora-secondary/releases/ +rsync -avAXSHP ./{old_release}/ /pub/archive/fedora-secondary/releases/{old_release}/ +cd ../updates/ +rsync -avAXSHP {old_release}/ /pub/archive/fedora-secondary/updates/{old_release}/ +cd testing +rsync -avAXSHP {old_release}/ /pub/archive/fedora-secondary/updates/testing/{old_release}/ .... ____ . Announce to the mirror list this has been done and that in 2 weeks you will @@ -196,7 +195,7 @@ move the old trees to archives. ____ [source,subs="attributes+"] .... -$ rbac-playbook -v /srv/web/infra/ansible/playbooks/manual/mirrormanager/move-to-archive.yml --extra-vars="product='Fedora' version='{old_release}'" +sudo ansible-playbook -v /srv/web/infra/ansible/playbooks/manual/mirrormanager/move-to-archive.yml --extra-vars="product='Fedora' version='{old_release}'" .... ____ . If there are problems, the postgres DB may have issues and so you need @@ -211,33 +210,39 @@ We need to do a cleanup here for both fedora and fedora-secondary for releases, ____ [source,subs="attributes+"] .... -$ ssh bodhi-backend01 -$ cd /pub/fedora/linux/releases/{old_release} -$ ls # make sure you have stuff here -$ rm -rf * -$ ln ../20/README . -$ cd /pub/fedora/linux/updates/{old_release} -$ ls # make sure you have stuff here -$ rm -rf * -$ ln ../20/README . -$ cd /pub/fedora/linux/updates/testing/{old_release} -$ ls # make sure you have stuff here -$ rm -rf * -$ ln ../20/README . +ssh bodhi-backend01 +cd /pub/fedora/linux/releases/{old_release} +ls +# make sure you have stuff here +rm -rf * +ln ../20/README . +cd /pub/fedora/linux/updates/{old_release} +ls +# make sure you have stuff here +rm -rf * +ln ../20/README . +cd /pub/fedora/linux/updates/testing/{old_release} +ls +# make sure you have stuff here +rm -rf * +ln ../20/README . #for fedora-secondary -$ cd /pub/fedora-secondary/releases/{old_release} -$ ls # make sure you have stuff here -$ rm -rf * -$ ln ../20/README . -$ cd /pub/fedora-secondary/updates/{old_release} -$ ls # make sure you have stuff here -$ rm -rf * -$ ln ../20/README . -$ cd /pub/fedora-secondary/updates/testing/{old_release} -$ ls # make sure you have stuff here -$ rm -rf * -$ ln ../20/README . +cd /pub/fedora-secondary/releases/{old_release} +ls +# make sure you have stuff here +rm -rf * +ln ../20/README . +cd /pub/fedora-secondary/updates/{old_release} +ls +# make sure you have stuff here +rm -rf * +ln ../20/README . +cd /pub/fedora-secondary/updates/testing/{old_release} +ls +# make sure you have stuff here +rm -rf * +ln ../20/README . .... ____