From 25d3f58d7a86de0b9b41a755c748ee09c8279288 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Dec 09 2024 09:15:28 +0000 Subject: Update branch and final SOPs for templatized compose crons In https://pagure.io/fedora-infra/ansible/pull-request/2388 I templatized the cronjobs for Branched and stable composes, so they don't need manual editing any more. We only need to make sure the cycle variables are correct and run the releng-compose playbook. Also, drop references to the container sync scripts as we no longer use those. Signed-off-by: Adam Williamson --- diff --git a/modules/release_guide/pages/final_release.adoc b/modules/release_guide/pages/final_release.adoc index 6ac2d85..e3eb809 100644 --- a/modules/release_guide/pages/final_release.adoc +++ b/modules/release_guide/pages/final_release.adoc @@ -2,10 +2,6 @@ include::_partials/attributes.adoc[] = Fedora Final Release -== Update `FedoraPreviousPrevious.yaml` in ansible repository - -Set the https://pagure.io/fedora-infra/ansible/blob/main/f/vars/all[variable] to True in ansible repository. - == Koji changes [source,subs="attributes+"] @@ -27,7 +23,7 @@ Set the bodhi stable tag to point to updates instead of base repo $ bodhi releases edit --name F{branched} --stable-tag f{branched}-updates .... -Set EOL of oldest release to corret date +Set EOL of oldest release to correct date [source,subs="attributes+"] .... $ bodhi releases edit --name F{old_release} --eol YYYY-MM-DD @@ -47,17 +43,6 @@ for the new release rather than being stuck on the GA compose forever. == Ansible Changes -=== Disable Branched Compose - -Now that we have a final GOLD compose, we dont need nightly branched -composes anymore. This is disabled in -https://pagure.io/fedora-infra/ansible/blob/main/f/roles/releng/files/branched[releng -role] in infra ansible repo and then running the playbook. - -.... -$ sudo rbac-playbook groups/releng-compose.yml -.... - === Lift RelEng freeze Lift the RelEng Freeze so that the updates will be pushed to stable. @@ -75,32 +60,23 @@ In pungi.rpm.conf.j2 we need to check that the release.version_int should be now === Update releng roles updates -. https://pagure.io/fedora-infra/ansible/blob/main/f/roles/releng/files/cloud-updates[cloud-updates]: Remove the commented version and append a new entry for {branched}. +. Set https://pagure.io/fedora-infra/ansible/blob/main/f/vars/all/00-FedoraCycleNumber.yaml[FedoraCycleNumber] to {branched}. -. https://pagure.io/fedora-infra/ansible/blob/main/f/roles/releng/files/container-updates[container-updates]: Remove the commented version and append a new entry for {branched}. - -. Update https://pagure.io/fedora-infra/ansible/blob/main/f/vars/all/00-FedoraCycleNumber.yaml[FedoraCycleNumber] to {branched}. - -. Update https://pagure.io/fedora-infra/ansible/blob/main/f/vars/all/FedoraBranchedBodhi.yaml[FedoraBranchedBodhi] to current. +. Set https://pagure.io/fedora-infra/ansible/blob/main/f/vars/all/FedoraBranchedBodhi.yaml[FedoraBranchedBodhi] to current. . Set https://pagure.io/fedora-infra/ansible/blob/main/f/vars/all/FedoraPreviousPrevious.yaml[FedoraPreviousPrevious] to True. -. Update https://pagure.io/releng/blob/main/f/scripts/sync-latest-container-base-image.sh[The container sync script's] `current_stable` variable. (see https://pagure.io/releng/c/697a12fb07bc2afbd3a1c057f65e41e1cf6ebf24[Example]) -. Update https://pagure.io/releng/blob/main/f/scripts/sync-ostree-base-containers.sh[The ostree container sync script's] `current_stable` variable. (see https://pagure.io/releng/c/15de8fc77d5c7fb3be0762b6bf56ad023908d144[Example]) - - -For the references, checkout this https://pagure.io/fork/jnsamyak/fedora-infra/ansible/c/6d1267970e09f412f1f51a2c203ae64e29e2c4c3[PR]. +. Set https://pagure.io/fedora-infra/ansible/blob/main/f/vars/all/FedoraBranched.yaml[FedoraBranched] to False. -== Final Container Release +Now run the releng-compose playbook: -On the GA date run the `sync-latest-container-base-image.sh` and `sync-ostree-base-containers.sh` - -[source,subs="attributes+"] .... -$ scripts/sync-latest-container-base-image.sh {branched} -$ scripts/sync-ostree-base-containers.sh {branched} +$ sudo rbac-playbook groups/releng-compose.yml .... +For the references, checkout this https://pagure.io/fork/jnsamyak/fedora-infra/ansible/c/6d1267970e09f412f1f51a2c203ae64e29e2c4c3[PR], +though note it is somewhat old and includes some things that are no longer needed, and leaves out some that should be done. + == Stage Final Release for Mirrors To prepare for running the staging script, make sure you have the following information: diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc index 3f22c78..b4b788c 100644 --- a/modules/release_guide/pages/sop_mass_branching.adoc +++ b/modules/release_guide/pages/sop_mass_branching.adoc @@ -209,38 +209,16 @@ infra ansible repo. This change includes, updating `koji-sync-listener.py`, Please check these files from the https://pagure.io/fedora-infra/ansible/c/549e5d3ace41c04fdbef9d81f359f16c2fe0c2fa?branch=main[commit] for your reference. -== Releng updates - -=== Update sync script - -In releng repository update -https://pagure.io/releng/blob/main/f/scripts/sync-latest-container-base-image.sh#_38[script]. - -And set current_rawhide variable. - -[NOTE] -==== -Hopefully someday soon this will be in cloud-image-uploader! -==== - == Toddlers === Add new SLA to the toddlers App Use https://pagure.io/fedora-infra/ansible/pull-request/1527[this PR] for reference and add new version to the config. -=== Enable Branched Compose - -We need to enable the branched compose. This is done in -https://pagure.io/fedora-infra/ansible/blob/main/f/roles/releng[releng role] of -infra ansbile repo. - -Please check the file `roles/releng/files/branched` from the https://pagure.io/fedora-infra/ansible/c/549e5d3ace41c04fdbef9d81f359f16c2fe0c2fa?branch=main[commit] for your reference. - === Fedora Branched -. Set FedoraBranched variable to True in infra ansible repo. -. Set FedoraBranchedBodhi variable to preenable in infra ansible repo. +. Set https://pagure.io/fedora-infra/ansible/blob/main/f/vars/all/FedoraBranched.yaml[FedoraBranched] to True. +. Set https://pagure.io/fedora-infra/ansible/blob/main/f/vars/all/FedoraBranchedBodhi.yaml[FedoraBranchedBodhi] to preenable. Please check the file `FedoraBranched.yaml` and `FedoraBranchedBodhi.yaml` from the https://pagure.io/fedora-infra/ansible/c/549e5d3ace41c04fdbef9d81f359f16c2fe0c2fa?branch=main[commit] for your reference.