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

[18.0-fr1][renovate]Run make force-dep #509

Merged

Conversation

gibizer
Copy link
Contributor

@gibizer gibizer commented Nov 25, 2024

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

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
@openshift-ci openshift-ci bot requested review from dprince and lewisdenny November 25, 2024 15:45
@gibizer
Copy link
Contributor Author

gibizer commented Nov 25, 2024

/hold #508 is needed first

gibizer added a commit to gibizer/keystone-operator that referenced this pull request Nov 25, 2024
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#509

Related: OSPRH-8355
@gibizer
Copy link
Contributor Author

gibizer commented Nov 26, 2024

/unhold
#508 landed

@gibizer
Copy link
Contributor Author

gibizer commented Nov 26, 2024

/test keystone-operator-build-deploy-tempest

error: build error: Failed to push image: trying to reuse blob sha256:3d252ab42824f0f833f0fcf3c660065bd878cb4de12b9c69b6a1758287e338e8 at destination: pinging container registry quay.rdoproject.org: Get "https://quay.rdoproject.org/v2/": dial tcp 38.129.56.158:443: i/o timeout

Copy link
Contributor

@stuggi stuggi left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link
Contributor

openshift-ci bot commented Dec 17, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gibizer, stuggi

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-merge-bot openshift-merge-bot bot merged commit 691a7c0 into openstack-k8s-operators:18.0-fr1 Dec 17, 2024
8 checks passed
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.

2 participants