From 982d260f89c3331253a9d90b1bffd13f9da953c1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Aug 23 2022 11:45:02 +0000 Subject: two important doc fixes: osterm perms and pdc product name 1. When we make a final compose, we make refs for ostree, but the docs had it being run as root, this meant that robosignatory couldn't sign it and the initial stable compose stalled. We should make it with ftpsync user to avoid this. 2. When branching we have been making new fedora as "fedora" product, but all the old ones are "Fedora" and lots of things query specifically by this, like zodbot's Fedora plugin for new cookies. We should just make it as 'Fedora' to start with. Signed-off-by: Kevin Fenzi --- diff --git a/docs/source/sop_composing_fedora.rst b/docs/source/sop_composing_fedora.rst index 7b8e268..bece632 100644 --- a/docs/source/sop_composing_fedora.rst +++ b/docs/source/sop_composing_fedora.rst @@ -298,17 +298,17 @@ Please update the refs as per the following commands on `bodhi-backend01.phx2.fe :: - $ sudo ostree refs --create=fedora/31/x86_64/updates/silverblue fedora/31/x86_64/silverblue - $ sudo ostree refs --create=fedora/31/aarch64/updates/silverblue fedora/31/aarch64/silverblue - $ sudo ostree refs --create=fedora/31/ppc64le/updates/silverblue fedora/31/ppc64le/silverblue + $ sudo -u ftpsync ostree refs --create=fedora/31/x86_64/updates/silverblue fedora/31/x86_64/silverblue + $ sudo -u ftpsync ostree refs --create=fedora/31/aarch64/updates/silverblue fedora/31/aarch64/silverblue + $ sudo -u ftpsync ostree refs --create=fedora/31/ppc64le/updates/silverblue fedora/31/ppc64le/silverblue $ sudo ostree refs --delete fedora/31/x86_64/silverblue $ sudo ostree refs --delete fedora/31/aarch64/silverblue $ sudo ostree refs --delete fedora/31/ppc64le/silverblue - $ sudo ostree refs --alias --create=fedora/31/x86_64/silverblue fedora/31/x86_64/updates/silverblue - $ sudo ostree refs --alias --create=fedora/31/aarch64/silverblue fedora/31/aarch64/updates/silverblue - $ sudo ostree refs --alias --create=fedora/31/ppc64le/silverblue fedora/31/ppc64le/updates/silverblue + $ sudo -u ftpsync ostree refs --alias --create=fedora/31/x86_64/silverblue fedora/31/x86_64/updates/silverblue + $ sudo -u ftpsync ostree refs --alias --create=fedora/31/aarch64/silverblue fedora/31/aarch64/updates/silverblue + $ sudo -u ftpsync ostree refs --alias --create=fedora/31/ppc64le/silverblue fedora/31/ppc64le/updates/silverblue .. note:: Before pushing the updates to fxx-updates, run the last branched compose so that both branched and rc composes have the same content. diff --git a/docs/source/sop_mass_branching.rst b/docs/source/sop_mass_branching.rst index e21e33b..a872a10 100644 --- a/docs/source/sop_mass_branching.rst +++ b/docs/source/sop_mass_branching.rst @@ -45,7 +45,7 @@ The "product-release" needs to be created in PDC. In the ``scripts/pdc/`` directory, run:: - $ python create-product-release.py fedora $TOKEN fedora $NEW_VERSION + $ python create-product-release.py fedora $TOKEN Fedora $NEW_VERSION On ``pdc-backend01.stg`` (for testing) or ``pdc-backend01`` (for production)