diff --git a/content/guides/apertis_release_process.md b/content/guides/apertis_release_process.md index 8495a01c11bdd72d297cc4b8ff296a9b53d3da0b..4d78f027757eb68ab823bc6f6d3cb93cb2747bcf 100644 --- a/content/guides/apertis_release_process.md +++ b/content/guides/apertis_release_process.md @@ -167,12 +167,14 @@ A Stable Point Release includes: ## Stable Point Release Preparation * Increment the *Build Suffix* in the Project configuration for each repository relevant to the release. See section **Build Suffix** for more details -* List the packages in the `:security`, `:updates` and other similar repositories -* Fast Forward Merge `--ff-only` the respective security and updates branches on Git. For example, `apertis/v2019-security` and `apertis/v2019-updates` should be merged back to `apertis/v2019`. Note: Not able to perform a fast forward merge means something got broken and needs to be investigated and fixed. -* Poke the pipeline and ensure that all the new packages (from the merged back changes to `apertis/v2019`) get built on OBS and land into the main repository. -* Drop the *updates*, *security* branches (Eg. `apertis/v2019-updates`, `apertis/v2019-security`) -* Delete the packages from the *updates*, *security* etc repositories on OBS (Eg. `apertis:v2019:updates:target`, `apertis:v2019:security:development`) -* Delete the pacakges from the *reprepro* database +* Run the [`fold-security-update-branches`](https://gitlab.apertis.org/infrastructure/apertis-infrastructure/-/blob/apertis/v2022dev0/release-scripts/gitlab/fold-security-update-branches) script to: + * List the packages in the `:security`, `:updates` and other similar repositories + * Fast Forward Merge `--ff-only` the respective security and updates branches on Git. For example, `apertis/v2019-security` and `apertis/v2019-updates` should be merged back to `apertis/v2019`. Note: Not able to perform a fast forward merge means something got broken and needs to be investigated and fixed. + * Poke the pipeline and ensure that all the new packages (from the merged back changes to `apertis/v2019`) get built on OBS and land into the main repository. + * Drop the *updates*, *security* branches (Eg. `apertis/v2019-updates`, `apertis/v2019-security`) + * Delete the packages from the *updates*, *security* etc repositories on OBS (Eg. `apertis:v2019:updates:target`, `apertis:v2019:security:development`) + * Delete the pacakges from the *reprepro* database +* Manually validate that the `fold-security-update-branches` script has merged all the updates into main repository * Rebuild the image to pick up the updated packages in the main repository. * Run the `copy-release` script on the images server (aura) to prepare the release. * `copy-release -v 20191120.0 v2019.1rc2`