-
Notifications
You must be signed in to change notification settings - Fork 102
[renovate]Run make force-dep #1178
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
[renovate]Run make force-dep #1178
Conversation
| "commands": ["make force-bump", "make gowork", "make tidy", "make manifests generate"], | ||
| "fileFilters": ["**/go.mod", "**/go.sum", "**/*.go", "**/*.yaml"], | ||
| "executionMode": "update" | ||
| "executionMode": "branch" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this means the post update task only runs one to all go.mod update separately.
|
/hold need the rest of the patches lined up |
1cf4ddb to
8adfcac
Compare
| "commitMessageExtra": "", | ||
| "prBodyColumns": ["Package"], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These are needed to hide the incorrect information renovate knows about the generated bump. Renovate does the bump to the latest version regardless the post update tasks and try to record that into the commit message. That bump is overwritten by the make force-dep post update task.
This enables renovate run on 18.0-fr1 branch. Please note that we have a special config for 18.0-fr1 enabled in openstack-k8s-operators#1178 Related: OSPRH-8355
8adfcac to
162860d
Compare
| { | ||
| "extends": [ | ||
| "github>openstack-k8s-operators/renovate-config:default.json5" | ||
| "github>openstack-k8s-operators/renovate-config:stable.json5" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Defined in openstack-k8s-operators/renovate-config#24 in a way that it only allows bump of deps within the openstack-k8s-operators org.
Renovate cannot follow dep version based on branching. So this hack runs make force-bump as a post update task in renovate run. That make target ensures that dependencies from openstack-k8s-operator org are bumped according to the current branch, 18.0-fr1. Note that git reset --hard HEAD is needed before make force-bump as at this point renovate already bumped all the dependencies based pseudoversions and this could mean that transitively bumped the versions of modules outside of openstack-k8s-operators, e.g. k8s.io. The make force-bump only pulls the openstack-k8s-operators dependencies based on the branch but it won't pull back other deps like k8s.io. So git reset is used to create a clean slate. Related: OSPRH-8355
162860d to
3824417
Compare
|
This is the example run from all the related changes gibizer#9 please check if this is the bump we want on 18.0-fr1. |
| ], | ||
| "postUpgradeTasks": { | ||
| "commands": ["make gowork", "make tidy", "make manifests generate"], | ||
| "commands": ["git reset --hard HEAD","make force-bump", "make gowork", "make tidy", "make manifests generate"], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- git reset is needed to avoid transitive dependencies leaking in from the bump renovate did.
- make force-bump will pull the openstack-k8s-operators related deps from the 18.0-fr1 branch.
|
/test openstack-operator-build-deploy-kuttl |
|
lgtm |
|
/unhold necessary deps has been landed. |
|
/unhold |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: fao89, gibizer The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Renovate cannot follow dep version based on branching. So this hack runs
make force-bump as a post update task in renovate run. That make target
ensures that dependencies from openstack-k8s-operator org are bumped
according to the current branch, 18.0-fr1.
Note that git reset --hard HEAD is needed before make force-bump as at
this point renovate already bumped all the dependencies based
pseudoversions and this could mean that transitively bumped the versions
of modules outside of openstack-k8s-operators, e.g. k8s.io. The make
force-bump only pulls the openstack-k8s-operators dependencies based on
the branch but it won't pull back other deps like k8s.io. So git reset
is used to create a clean slate.
Related: OSPRH-8355