Skip to content

Commit

Permalink
Update procedures for Copr workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
ehelms committed Nov 2, 2023
1 parent 6383a06 commit a64c4b5
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 27 deletions.
12 changes: 3 additions & 9 deletions procedures/foreman/branch.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,6 @@
- [ ] Use <%= rel_eng_script('upload_yum_gpg') %> to create [releases/<%= release %>/RPM-GPG-KEY-foreman](https://yum.theforeman.org/releases/<%= release %>/RPM-GPG-KEY-foreman) on yum.theforeman.org
- [ ] Commit the [settings file](https://github.com/theforeman/theforeman-rel-eng/blob/master/releases/foreman/<%= release %>/settings) to the `theforeman-rel-eng` repository
- [ ] Create new settings files for [client](https://github.com/theforeman/theforeman-rel-eng/blob/master/releases/client/<%= release %>/settings), ensure it has the rights `OSES` list and commit it too.
- [ ] Create mash configs in [tool_belt](https://github.com/theforeman/tool_belt/tree/master/configs/foreman) using <%= rel_eng_script('create_mash_configs') %> and submit this as a PR.
- [ ] Once merged, deploy mash configuration on Koji using <%= rel_eng_script('deploy_mash_configs') %>
- [ ] Update [collection-mash-split.py](https://github.com/theforeman/foreman-infra/blob/master/koji/collection-mash-split.py)
- Add a Katello version mapping
- Make any changes if needed (usually happens when there are tag changes)
- Deploy using `scp collection-mash-split.py root@koji.katello.org:/usr/local/bin`
- [ ] Open a PR with the result of [jenkins-jobs](https://github.com/theforeman/jenkins-jobs) branching: `./branch-foreman <%= release %> KATELLO_VERSION`
- [ ] Open PR to remove any jobs that are related to end of life versions
- [ ] Open PR to add <%= release %> to [Forklift versions config](https://github.com/theforeman/forklift/blob/master/vagrant/config/versions.yaml). Once the PR is merged, upgrade pipelines will fail, so do not merge it before packaging has been branched.
Expand All @@ -75,10 +69,10 @@

## Release Engineer

- Branch RPM packaging using [tool_belt](https://github.com/theforeman/tool_belt)
- [ ] Clone tags and create build targets in Koji: `bundle exec ./tools.rb koji --commit configs/foreman/<%= release %>.yaml`
Note that you must use koji client < 1.30 since clone-tag was changed and our Koji server is too old. See https://docs.pagure.org/koji/release_notes/release_notes_1.30/#system-changes for details.
- Branch RPM packaging
- [ ] Create a `rpm/<%= release %>` branch in [foreman-packaging](https://github.com/theforeman/foreman-packaging) based on `rpm/develop`
- [ ] Update `foreman_version` in `package_manifest.yaml`
- [ ] Create release repositories in Copr by forking nightly repositories `obal copr-project copr_projects`
- Branch Debian packaging
- [ ] Clone Debian nightly repos to <%= release %> using [copy/freight instructions](https://projects.theforeman.org/projects/foreman/wiki/Debian_Packaging#Branching-for-release)
- [ ] Create a `deb/<%= release %>` branch in [foreman-packaging](https://github.com/theforeman/foreman-packaging) based on `deb/develop`
Expand Down
14 changes: 6 additions & 8 deletions procedures/foreman/release.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,13 @@ Note: If for some reason there was an issue with the tarballs that required uplo
- [ ] [rpm/<%= short_version%>](https://github.com/theforeman/foreman-packaging/pulls?q=is%3Apr+is%3Aopen+base%3Arpm%2F<%= short_version %>)
- [ ] [deb/<%= short_version%>](https://github.com/theforeman/foreman-packaging/pulls?q=is%3Apr+is%3Aopen+base%3Adeb%2F<%= short_version %>)
- Sign the RPMs in the release
- [ ] <%= rel_eng_script('download_rpms') %>
- [ ] <%= rel_eng_script('sign_rpms') %>
- [ ] <%= rel_eng_script('upload_rpm_signatures') %>
- [ ] <%= rel_eng_script('upload_rpms') %>
- [ ] <%= rel_eng_script('generate_stage_repository') %>
- [ ] <%= rel_eng_script('sign_stage_rpms') %>
- [ ] <%= rel_eng_script('upload_stage_rpms') %>
- Sign RPMs for client repos (call scripts with `PROJECT=client`)
- [ ] <%= rel_eng_script('download_rpms') %>
- [ ] <%= rel_eng_script('sign_rpms') %>
- [ ] <%= rel_eng_script('upload_rpm_signatures') %>
- [ ] <%= rel_eng_script('upload_rpms') %>
- [ ] <%= rel_eng_script('generate_stage_repository') %>
- [ ] <%= rel_eng_script('sign_stage_rpms') %>
- [ ] <%= rel_eng_script('upload_stage_rpms') %>
- [ ] Kick off the [release pipeline](https://ci.theforeman.org/job/foreman-<%= short_version %>-release-pipeline/) by calling `<%= rel_eng_script('release_pipeline') %>`
- [ ] Kick off the [client pipeline](https://ci.theforeman.org/job/foreman-client-<%= short_version %>-rpm-pipeline/) by calling `PROJECT=client <%= rel_eng_script('release_pipeline') %>`
- [ ] Kick off the [plugins pipeline](https://ci.theforeman.org/job/foreman-plugins-<%= short_version %>-rpm-pipeline/) by calling <%= rel_eng_script('plugins_pipeline') %>
Expand Down
8 changes: 0 additions & 8 deletions procedures/katello/branch.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
- [ ] Manually update the following sections:
- [ ] releases: update to current release. Move the previous 'current' release to prior_releases below.
- [ ] prior_releases: Remove the oldest prior_release (check with that release owner first to see if there's a reason it should stay)
- [ ] mash_scripts: update Katello version number in all values
- [ ] repos: Update branch names to current versions, including any new releases that need to happen
- [ ] ignores: Delete all items from this list and start fresh (this will be used for cherry-picks later)
- [ ] gpg-key: When it becomes available, get the new Foreman GPG key for the corresponding Foreman version ([example here](https://github.com/theforeman/theforeman-rel-eng/blob/master/releases/foreman/2.5/settings) and put the last 8 characters here
Expand Down Expand Up @@ -74,10 +73,3 @@
- [ ] Rename the "Katello Next" release to Katello <%= develop %>.0
- [ ] Recreate the "Katello Next" release and indicate that it is a placeholder for issues belonging to the next version of Katello
- [ ] Create the "Katello <%= release %>.1 TODO" custom query using the last one as a template


## Release Engineer

- [ ] Run `./tools.rb koji configs/katello/<%= release %>.yaml --confirm` from [tool_belt](https://github.com/theforeman/tool_belt) to create Koji tags
- [ ] Run `./tools.rb mash-scripts configs/katello/<%= release %>.yaml` from [tool_belt](https://github.com/theforeman/tool_belt) to create Koji mash configs and open PR to tool_belt to commit
- [ ] Copy mash configs to Koji using <%= rel_eng_script('deploy_mash_configs') %>
7 changes: 5 additions & 2 deletions procedures/katello/release.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,14 @@
- [ ] Wait for Foreman's GA to be packaged and built before proceeding
<% end -%>
- [ ] Update release version similar to [here](https://github.com/theforeman/theforeman-rel-eng/commit/2029a9688da00d9c385c3438dd71b594ba5f728e)
- [ ] Update `katello`, `katello-repos` and `rubygem-katello`
- [ ] Update `katello`, `katello-repos` and `rubygem-katello`
- [ ] Use <%= rel_eng_script('bump_rpm_packaging') %>: `PROJECT=katello VERSION=<%= short_version %> ./bump_rpm_packaging`
- [ ] Merge packaging PR once job is green
- [ ] Use <%= rel_eng_script('wait_packaging') %> to wait for [Jenkins to build the packages](https://ci.theforeman.org/job/foreman-packaging-rpm-<%= short_version %>-release/) (replace <%= short_version %> with the matching Foreman version)
- [ ] <%= rel_eng_script('download_rpms') %>, <%= rel_eng_script('sign_rpms') %>, <%= rel_eng_script('upload_rpm_signatures') %>, <%= rel_eng_script('upload_rpms') %>
- Sign the RPMs in the release
- [ ] <%= rel_eng_script('generate_stage_repository') %>
- [ ] <%= rel_eng_script('sign_stage_rpms') %>
- [ ] <%= rel_eng_script('upload_stage_rpms') %>
- [ ] Use <%= rel_eng_script('release_pipeline') %> to kick off the [release pipeline](https://ci.theforeman.org/job/katello-<%= short_version %>-rpm-pipeline/)

# Once release is out
Expand Down
10 changes: 10 additions & 0 deletions procedures/pulpcore/update.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,16 @@ The `python-pulp_2to3_migration` package is named differently due to a tito bug

Any change to packaging requires signing, as otherwise the repo can't be published.


If working with Pulpcore 3.28+:

* [ ] Sign the RPMs in the release, pass `PROJECT=pulpcore` and `VERSION=<%= release %>` to every invocation.
* [ ] <%= rel_eng_script('generate_stage_repository') %>
* [ ] <%= rel_eng_script('sign_stage_rpms') %>
* [ ] <%= rel_eng_script('upload_stage_rpms') %>

If working with Pulpcore 3.28 or less:

* [ ] Sign the RPMs in the release, pass `PROJECT=pulpcore` and `VERSION=<%= release %>` to every invocation.
* [ ] [Download](https://github.com/theforeman/theforeman-rel-eng/blob/master/download_rpms)
* [ ] [Sign](https://github.com/theforeman/theforeman-rel-eng/blob/master/sign_rpms)
Expand Down

0 comments on commit a64c4b5

Please sign in to comment.