Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Katello 4.15 #437

Merged
merged 3 commits into from
Nov 6, 2024
Merged

Add Katello 4.15 #437

merged 3 commits into from
Nov 6, 2024

Conversation

sambible
Copy link
Contributor

No description provided.

releases/katello/4.15/settings Outdated Show resolved Hide resolved
releases/katello/4.15/settings Outdated Show resolved Hide resolved
Copy link
Member

@chris1984 chris1984 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM @ekohl have all your comments been addressed?

Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The contents are OK, but I have a bit of an issue that this right now depends on Foreman's config (how else is it going to inherit that?) which is still missing. We also ran into this last time, but I really think this should be done together with Foreman 3.13's config.

Right now we have this procedure for Foreman:

- Create new GPG key for release. See [GPG_Keys](https://github.com/theforeman/theforeman-rel-eng/#generating-a-new-gpg-key-for-a-xy-release) if needed.
- [ ] <%= rel_eng_script('generate_gpg') %>
- [ ] <%= rel_eng_script('export_gpg_private') %> to back up
- [ ] <%= rel_eng_script('sign_gpg') %>
- [ ] <%= rel_eng_script('upload_gpg') %>
- Publish the key
- [ ] Use <%= rel_eng_script('export_gpg_public') %> to show the GPG key and update the website's [security.md](https://github.com/theforeman/theforeman.org/blob/gh-pages/security.md) and create a file in [static/keys](https://github.com/theforeman/theforeman.org/tree/gh-pages/static/keys)
- [ ] 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.

And then for Katello:

- [ ] Commit the [settings file](https://github.com/theforeman/theforeman-rel-eng/blob/master/releases/katello/<%= release %>/settings) to the `theforeman-rel-eng` repository. See an example [here](https://github.com/theforeman/theforeman-rel-eng/commit/29b6b92e82de25c7a0e32fb9ca36468d8df0f6a1)

Could you (plural, so including @chris1984) take a look at the procedures to see how we can prevent this from again being an issue with Katello 4.16?

On the solution: we already let the release engineer create the Jenkins config for Katello:

- [ ] Open a PR with the result of [jenkins-jobs](https://github.com/theforeman/jenkins-jobs) branching: `./branch-foreman <%= release %> KATELLO_VERSION`

To me it feels natural to also instruct the release owner to prepare Katello's rel-eng settings (which implies dropping it from Katello's procedure), but making the dependency explicit in Katello's procedure is also fine by me.

I'd appreciate @pcreech to weigh in as well since he's often the release engineer doing the Foreman side.

@chris1984
Copy link
Member

chris1984 commented Nov 4, 2024

The contents are OK, but I have a bit of an issue that this right now depends on Foreman's config (how else is it going to inherit that?) which is still missing. We also ran into this last time, but I really think this should be done together with Foreman 3.13's config.

Right now we have this procedure for Foreman:

- Create new GPG key for release. See [GPG_Keys](https://github.com/theforeman/theforeman-rel-eng/#generating-a-new-gpg-key-for-a-xy-release) if needed.
- [ ] <%= rel_eng_script('generate_gpg') %>
- [ ] <%= rel_eng_script('export_gpg_private') %> to back up
- [ ] <%= rel_eng_script('sign_gpg') %>
- [ ] <%= rel_eng_script('upload_gpg') %>
- Publish the key
- [ ] Use <%= rel_eng_script('export_gpg_public') %> to show the GPG key and update the website's [security.md](https://github.com/theforeman/theforeman.org/blob/gh-pages/security.md) and create a file in [static/keys](https://github.com/theforeman/theforeman.org/tree/gh-pages/static/keys)
- [ ] 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.

And then for Katello:

- [ ] Commit the [settings file](https://github.com/theforeman/theforeman-rel-eng/blob/master/releases/katello/<%= release %>/settings) to the `theforeman-rel-eng` repository. See an example [here](https://github.com/theforeman/theforeman-rel-eng/commit/29b6b92e82de25c7a0e32fb9ca36468d8df0f6a1)

Could you (plural, so including @chris1984) take a look at the procedures to see how we can prevent this from again being an issue with Katello 4.16?

On the solution: we already let the release engineer create the Jenkins config for Katello:

- [ ] Open a PR with the result of [jenkins-jobs](https://github.com/theforeman/jenkins-jobs) branching: `./branch-foreman <%= release %> KATELLO_VERSION`

To me it feels natural to also instruct the release owner to prepare Katello's rel-eng settings (which implies dropping it from Katello's procedure), but making the dependency explicit in Katello's procedure is also fine by me.

I'd appreciate @pcreech to weigh in as well since he's often the release engineer doing the Foreman side.

I went through the branching procedure and I agree it makes sense. Foreman should be branching before Katello and the release engineer would if all things are going smooth have made the Foreman config and so it makes sense while working on the Foreman config, create the Katello config. I also while going through the release procedure did find a 404 with the doc link #439

The only question that comes up is if you are doing a Katello z release where Foreman is not involved, so maybe have a step in the release procedure doc saying if this is a z release then update the config, so the Katello owner is only updating instead of creating the config.

@sambible
Copy link
Contributor Author

sambible commented Nov 6, 2024

#445 - an issue that captures the doc update request, and links back to here.

@chris1984
Copy link
Member

@ekohl I had Sam create this issue - #445 so we don't hit this in Katello 4.16. Are you fine with that and we can get this in?

@sambible sambible requested a review from ekohl November 6, 2024 21:09
@ekohl
Copy link
Member

ekohl commented Nov 6, 2024

The only question that comes up is if you are doing a Katello z release where Foreman is not involved, so maybe have a step in the release procedure doc saying if this is a z release then update the config, so the Katello owner is only updating instead of creating the config.

That's the release procedure and I think that should remain unchanged. I was only talking about the branching procedure.

@ekohl ekohl merged commit 12a1f8b into theforeman:master Nov 6, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants