Skip to content

USHIFT-5765: common_versions.sh script generator #5037

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

USHIFT-5765: common_versions.sh script generator #5037

wants to merge 13 commits into from

Conversation

vanhalenar
Copy link
Contributor

This PR is the first step: it introduces a script to generate the variables for common_versions.sh. Next steps are up for discussion (making it part of rebase).

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 9, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 9, 2025 •
edited by openshift-ci bot
Loading

@vanhalenar: This pull request references USHIFT-5765 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

In response to this:

This PR is the first step: it introduces a script to generate the variables for common_versions.sh. Next steps are up for discussion (making it part of rebase).

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from eslutsky and pacevedom June 9, 2025 12:50
pmtk
pmtk reviewed Jun 9, 2025
View reviewed changes
pmtk
pmtk reviewed Jun 12, 2025
View reviewed changes
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 16, 2025
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 16, 2025
pmtk
pmtk reviewed Jun 17, 2025
View reviewed changes
Copy link
Member

@pmtk pmtk left a comment

Choose a reason for hiding this comment

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

Very nice.
Only minor comments mostly regarding logs :)

@pmtk
Copy link
Member

pmtk commented Jun 30, 2025

/retest
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 30, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jun 30, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pmtk, vanhalenar

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 30, 2025
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 880568a and 2 for PR HEAD 5b3e287 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 0d45f36 and 1 for PR HEAD 5b3e287 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 0d45f36 and 2 for PR HEAD 5b3e287 in total

1 similar comment
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 0d45f36 and 2 for PR HEAD 5b3e287 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD ef70e1c and 1 for PR HEAD 5b3e287 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 3aaa6f4 and 0 for PR HEAD 5b3e287 in total

@openshift-ci-robot
Copy link

/hold

Revision 5b3e287 was retested 3 times: holding

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 1, 2025
@ggiguash
Copy link
Contributor

ggiguash commented Jul 5, 2025

/lgtm cancel

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 5, 2025
ggiguash
ggiguash reviewed Jul 5, 2025
View reviewed changes
test/bin/common_versions.sh
export MINOR_VERSION=20
export PREVIOUS_MINOR_VERSION=$(( "${MINOR_VERSION}" - 1 ))
export YMINUS2_MINOR_VERSION=$(( "${MINOR_VERSION}" - 2 ))
export FAKE_NEXT_MINOR_VERSION=$(( "${MINOR_VERSION}" + 1 ))

# For a main branch, the current release repository usually comes from
Copy link
Contributor

Choose a reason for hiding this comment

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

If we generate this file, we should keep the comments too - if not in the generated file, than in the generator code.

These comments contain valuable information.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've reworded the comments a bit and included them in the generator code, is there any specific information that is missing?

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 3, 2025
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 3, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 3, 2025

@vanhalenar: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-tests-bootc 09efb4b link true /test e2e-aws-tests-bootc

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@agullon
Copy link
Contributor

agullon commented Sep 3, 2025

Not sure about how or who should execute this new script, but I suggest you add a bash script to run the python one.
Move this new python script into pyutils (maybe you can reuse something from common.py) and use a similar bash script like build_bootc_images.sh to execute the python script.

@agullon
Copy link
Contributor

agullon commented Sep 3, 2025

I also suggest splitting the new python script in 2 files: one with the code and another one with the content in output var. You can name this last one common_versions.sh.template or something similar. I think this is a good practice because this new template is quite big, and it's easier to review changes in the future.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eslutsky eslutsky Awaiting requested review from eslutsky

@pacevedom pacevedom Awaiting requested review from pacevedom

2 more reviewers

@pmtk pmtk pmtk left review comments

@ggiguash ggiguash ggiguash left review comments

Reviewers whose approvals may not affect merge requirements
Assignees

@pmtk pmtk

@ggiguash ggiguash

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@vanhalenar @openshift-ci-robot @pmtk @ggiguash @agullon @openshift-merge-robot