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

Katello 4.12 config addition, remove Koji tags and mash scripts from nightly #573

Merged
merged 1 commit into from
Feb 19, 2024

Conversation

qcjames53
Copy link
Contributor

@qcjames53 qcjames53 commented Feb 8, 2024

This is the config file for Katello 4.12 tooling plus the removal of koji and mash scripts from the nightly config moving forward. Please take care when reviewing this; this is my first branching so there is a good chance there are multiple mistakes in here :)

Notable questions:

  • I updated flat-nodejs-14-el8 to flat-nodejs-16-el8
  • Is centos8-devel still ok? I understand there have been issues with centos8 recently.

@ianballou
Copy link
Contributor

I would recommend looking at both the Katello 4.11 config and nightly to figure out how it should look. I think some sections are missing, like the one that lists all relevant repos, or the one that lists all releases.

What I typically do is make the file match up with the nightly config and replace nightly keywords with "4.12". Then, check the prior release for missing sections.

Your release engineer can help point out anything that is missing, so feel free to ping them too.

Also, not a hard requirement, but look back to an older one like Katello 4.3... we used to give our releases fun code names but stopped at some point. I miss that a little :)

@ianballou
Copy link
Contributor

Also, I totally agree that our documentation here is sorely lacking. The configuration is always been a messy part of branching. If you're interested it could be a great place to improve our branching guide.

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.

We want to add the sections that are in this file to your PR for tool_belt to pick up what cherrypicks needs to be made:

https://github.com/theforeman/tool_belt/blob/master/configs/katello/4.11.yaml#L9-L44

foreman-packaging goes to 3.10
hammer-cli-katello goes to 1.12.z
smart proxy container gateway goes to 1.2.0
katello-selinux stays the same
virt-who-configure goes to 0.5.20
cert tools and host tools stays the same
change the katello branch to 4.12

@qcjames53
Copy link
Contributor Author

Just force pushed some new changes. Thanks for the help, Chris and Ian!

FYI I still left build_package_group_source_tag on nightly.

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.

Looks good on the 4.12 file, did you mean to push up the 4.11 file too?

@qcjames53
Copy link
Contributor Author

I did not. A little confused why there is no diff. Let me take a look.

@qcjames53
Copy link
Contributor Author

It is fixed. I needed to rebase again.

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.

few small comments then it's good to go

configs/katello/4.12.yaml Outdated Show resolved Hide resolved
configs/katello/4.12.yaml Outdated Show resolved Hide resolved
configs/katello/4.12.yaml Outdated Show resolved Hide resolved
configs/katello/4.12.yaml Outdated Show resolved Hide resolved
configs/katello/4.12.yaml Outdated Show resolved Hide resolved
@qcjames53 qcjames53 changed the title Added Katello 4.12 config file Added Katello 4.12 config file, removed Koji tags from nightly Feb 19, 2024
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.

ACK, the latest change looks good to me, I would adjust the PR title and commit message since we are changing the nightly and 4.11 config as well as 4.12 so we don't have confusion if we have to look back at this PR.

Will let @ekohl give the last word and look since I don't have merge rights

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.

Actually overlooked the 4.11 i see mash-scripts and tags still in that one, so either we should remove that one out of this pr and then keep your commit/pr message the same or adjust accordingly

@qcjames53
Copy link
Contributor Author

I actually don't understand why 4.11 keeps getting added. I have not changed it. I'll remove it in a few minutes, sorry about that.

@qcjames53
Copy link
Contributor Author

@chris1984 Are you ok with the PR title as it stands now (only 4.12 and nightly changed)?

@ekohl
Copy link
Member

ekohl commented Feb 19, 2024

@qcjames53 regarding the commit message: imperative mood is the proper tense for the summary (first line).

@qcjames53 qcjames53 changed the title Added Katello 4.12 config file, removed Koji tags from nightly Katello 4.12 config addition, remove Koji tags and mash scripts from nightly Feb 19, 2024
@qcjames53
Copy link
Contributor Author

Done. Thank you @ekohl :)

configs/katello/nightly.yaml Outdated Show resolved Hide resolved
configs/katello/4.12.yaml Outdated Show resolved Hide resolved
@qcjames53
Copy link
Contributor Author

Added the endings you requested, thanks :)

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.

From a technical point of view 👍 and I started the tests. I didn't check the version numbers.

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.

ACK, looks good from a version standpoint based on the comments I left in the PR discussion and the file looks good now with the stuff gone that is no longer needed. @ekohl can you merge it?

@ekohl ekohl merged commit 2454c01 into theforeman:master Feb 19, 2024
2 checks passed
@qcjames53 qcjames53 deleted the 4.12 branch February 19, 2024 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants