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

Allow branching katello without foreman_version #338

Merged

Conversation

wbclark
Copy link
Contributor

@wbclark wbclark commented Jan 25, 2024

This was previously added as a requirement because of the Katello release procedure, but it's not used anywhere in the Katello branching procedure currently, and the too-strict conditional is breaking the command that generates the Katello branching procedure.

This was previously added as a requirement to the Katello release
procedure, but it's not necessary for Katello branching.
@ekohl
Copy link
Member

ekohl commented Jan 25, 2024

I'll need to take a look. Katello branching still relies on Foreman branching. Many critical steps (like packaging) are now in the Foreman procedure.

On mobile now, so hard to check but do we call these sychronization steps out? For release we do say not to announce GA before Foreman, but perhaps these should be called out more

@wbclark wbclark changed the title Allow branching katello without Foreman version Allow branching katello without foreman_version Jan 26, 2024
@wbclark
Copy link
Contributor Author

wbclark commented Jan 26, 2024

I'll need to take a look. Katello branching still relies on Foreman branching. Many critical steps (like packaging) are now in the Foreman procedure.

On mobile now, so hard to check but do we call these sychronization steps out? For release we do say not to announce GA before Foreman, but perhaps these should be called out more

I looked for content in the katello branching template that used the foreman_branching variable, or for obvious places where it would benefit from that addition, and couldn't find any.

The key issue is that context[:foreman_version] is not set in the command corresponding to branch in the procedures hash (but is set for the release command by comparison), so the unless conditional was blocking @qcjames53 and I from rendering the template.

I don't mind setting context[:foreman_version] in the branch command either to fix this if you prefer that route, I just didn't see a need for it today based on the current template contents.

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.

We indeed don't pass it in here:

./procedure branch --project "$PROJECT" --release "$VERSION" --target-date "$TARGET_DATE" --owner "$OWNER" --engineer "$ENGINEER"

@ekohl ekohl merged commit 2b6170c into theforeman:master Jan 29, 2024
3 checks passed
@wbclark wbclark deleted the katello_branching_without_foreman_version branch January 29, 2024 17:20
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.

2 participants