From d31679f8d166f8377146b9d2311fd7e65690cd7f Mon Sep 17 00:00:00 2001 From: Till Maas Date: Nov 08 2015 09:17:38 +0000 Subject: Merge #41 `Add missing characters to retiring SOP` --- diff --git a/docs/source/conf.py b/docs/source/conf.py index ee12c84..a5795bd 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -55,7 +55,7 @@ master_doc = 'index' # General information about the project. project = u'Fedora Release Engineering' -copyright = u'2015, Red Hat' +copyright = u'2015, Red Hat, Inc. and others' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/source/index.rst b/docs/source/index.rst index f1e0020..de91df4 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -39,7 +39,7 @@ Team Composition * `Dennis Gilmore (dgilmore) `_ (Lead) * `Kevin Fenzi (nirik) `_ -* `Till Mass (tyll) `_ +* `Till Maas (tyll) `_ * `Jon Disnard (masta) `_ * `Dan Horák (sharkcz) `_ (secondary arches) * `Peter Robinson (pbrobinson) `_ @@ -136,7 +136,7 @@ Meeting Minutes --------------- Minutes are posted to the rel-eng mailing list. They are also available at the `Meetbot team page for releng -`_ +`_ There are also `historical Meeting Minutes for 2007-04-16 to 2009-05-04 `_. diff --git a/docs/source/sop.rst b/docs/source/sop.rst index 137a7c9..dc9a7fc 100644 --- a/docs/source/sop.rst +++ b/docs/source/sop.rst @@ -17,14 +17,13 @@ aren't the only ones that can fix a problem. The Community ============= -The SOP section of the wiki is left in the public because it is our hope that -others in the community will add common problems, fix our steps and just in -general look over what we're doing and help us when we're doing something -stupid. This is a wiki and in true wiki fashion we encourage anyone interested -to go over our processes with a fine tooth comb. It'll make us better and -we'll probably learn something in the process. General rule, make change first, -ask questions later. Many people are watching the wiki so if something is not -right, we'll fix it or revert the page. +The SOP section is left in the public because it is our hope that others in the +community will add common problems, fix our steps and just in general look over +what we're doing and help us when we're doing something stupid. We encourage +anyone interested to go over our processes with a fine tooth comb. It'll make +us better and we'll probably learn something in the process. Therefore please +open a `pull request`_ to suggest improvements. + Procedures ========== @@ -68,3 +67,4 @@ Standard Operating Procedures sop_update_critpath sop_updating_comps +.. _pull request: https://pagure.io/releng/pull-requests diff --git a/docs/source/sop_package_blocking.rst b/docs/source/sop_package_blocking.rst index 7207dbc..af20ee6 100644 --- a/docs/source/sop_package_blocking.rst +++ b/docs/source/sop_package_blocking.rst @@ -4,119 +4,20 @@ Package Blocking Description =========== -If a `package is removed from Fedora`_, for example because it was renamed, it -needs to be blocked in Koji. This prevents creating new package builds and -distribution of built RPMs. Packages are blocked in the listing of ``tags``, -due to inheritance it is enough to block packages at the oldest tag will make -it unavailable also in upstream tags. +If a `package is removed (retired) from Fedora`_, for example because it was +renamed, it needs to be blocked in Koji. This prevents creating new package +builds and distribution of built RPMs. Packages are blocked in the listing of +``tags``, due to inheritance it is enough to block packages at the oldest tag +will make it unavailable also in upstream tags. Action ====== +The blocking of retired packages is done by the `block_retired.py`_ script as +part of the daily Rawhide and Branched composes. -Perform the blocking --------------------- -Discover proper place to block -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The ticket should tell you which Fedora releases to block the package in. -Typically it'll say "Fedora 13", "F14" or rawhide. This means we need to block -it at that Fedora level and all future tags. However we do not block packages -in a Fedora release that has gone public unless. - -The appropriate place to block a package is at the "f??" tag level (even for -rawhide, then the tag for the next release needs to be used, not the rawhide -tag). This way the setting of block or not is inherited into future tags. - -Performing the package block -^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -To block a package for a tag, use the ``block-pkg`` method of Koji. - -:: - $ koji block-pkg --help - Usage: koji block-pkg [options] tag package [package2 ...] - (Specify the --help global option for a list of other help options) - - Options: - -h, --help show this help message and exit - -For example, if we were asked to block python-psyco in Fedora 20 we would -issue: - -:: - - $ koji block-pkg f20 python-psyco - -Now the ticket can be closed. - -Tags for EPEL are named ``dist-5E-epel-build``, ``dist-6E-epel-build`` or -``epel7``. - -EPEL Packages moved to RHEL ---------------------------- -If a package moved to RHEL, it needs to be unblocked in the related build tag -to allow the RHEL package to be available in Koji: - -:: - - $ koji unblock-pkg dist-6E-epel-build foo - -In case the package is only available on some architectures and a EPEL package -is still needed, the package must not be blocked but only all Fedora builds -need to be removed: - -:: - - $ koji untag-build --all dist-6E-epel foo - -Verification -============ -To verify that the package was successfully blocked use the ``list-pkgs`` koji -command: - -:: - - $ koji list-pkgs --show-blocked --package python-psyco - -We should see the package listed as blocked: - -:: - - Package Tag Extra Arches Owner - ----------------------- ----------------------- ---------------- --------------- - python-psyco f20 konradm [BLOCKED] - -We should not see it listed in any later Fedora tags. - -Also the latest-pkg command should not return anything: - -:: - - $ koji latest-pkg dist-f8 hunspell-he - Build Tag Built by - ---------------------------------------- -------------------- ---------------- - -Consider Before Running -======================= -* Don't block packages in a released Fedora. -* Make sure that you're being asked to block at the srpm level. Blocking - sub-packages cannot be done, but will happen naturally when the source - package no longer builds the sub package. -* Watch the next day's rawhide/branched/whatever report for a slew of broken - deps related to the package. We may have to unblock the package in order to - fix the deps. Check this with repoquery: - - :: - - $ repoquery -q --whatrequires --repoid --alldeps - - to catch binary dependencies and: - - :: - - repoquery -q --whatrequires --repoid -source --archlist src --alldeps - -* Ensure that if the package is being renamed/replaced that proper Obsoletes/Provides are in place - -.. _package is removed from Fedora: +.. _package is removed (retired) from Fedora: https://fedoraproject.org/wiki/How_to_remove_a_package_at_end_of_life + +.. _block_retired.py: + https://pagure.io/releng/blob/master/f/scripts/block_retired.py diff --git a/docs/source/sop_retire_orphaned_packages.rst b/docs/source/sop_retire_orphaned_packages.rst index 269f105..b444325 100644 --- a/docs/source/sop_retire_orphaned_packages.rst +++ b/docs/source/sop_retire_orphaned_packages.rst @@ -52,14 +52,15 @@ the remaining `packages are retired`_ Bugs ^^^^ -This procedure probably leaves open bugs for the d packages behind. It is not -within the scope of releng to take care of these. If bugs are closed, only bugs -targeted at Rawhide should be affected, since other branches might still be -maintained. +This procedure probably leaves open bugs for the retired packages behind. It is +not within the scope of release engineering to take care of these. If bugs are +closed, only bugs targeted at Rawhide should be affected, since other branches +might still be maintained. Verification ============ -To verify that the packages were blocked correctly we can use the ``latest-pk`` ``koji`` action. +To verify that the packages were blocked correctly we can use the +``latest-pkg`` ``koji`` action. ::