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

Set Heat timeout #1163

Merged

Conversation

fao89
Copy link
Contributor

@fao89 fao89 commented Oct 29, 2024

Copy link
Contributor

openshift-ci bot commented Oct 29, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Copy link

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/openstack-operator for 1163,d36f08151874334936b4804e0053d1a471690dd9

Copy link

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/8be89113e4ca4295b73d48547d806803

✔️ openstack-k8s-operators-content-provider SUCCESS in 58m 01s
podified-multinode-edpm-deployment-crc FAILURE in 33m 40s
cifmw-crc-podified-edpm-baremetal FAILURE in 42m 14s
adoption-standalone-to-crc-ceph-provider RETRY_LIMIT in 40m 04s
openstack-operator-tempest-multinode FAILURE in 37m 36s

@fao89 fao89 force-pushed the OSPRH-10965 branch 2 times, most recently from 7a8db46 to ca8fe21 Compare October 29, 2024 14:46
Copy link

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/168a30a1fdb442da9fb30f964c2cfdff

✔️ openstack-k8s-operators-content-provider SUCCESS in 5h 20m 34s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 15m 11s
cifmw-crc-podified-edpm-baremetal RETRY_LIMIT in 27m 31s
✔️ adoption-standalone-to-crc-ceph-provider SUCCESS in 3h 18m 05s
✔️ openstack-operator-tempest-multinode SUCCESS in 1h 37m 26s

@bshephar
Copy link
Contributor

If we enable Heat in functional tests: #1164

Then we can validate that this route annotation is applied like we do with others here:
https://github.com/openstack-k8s-operators/openstack-operator/blob/main/tests/functional/ctlplane/openstackoperator_controller_test.go#L578

@fao89 fao89 marked this pull request as ready for review November 5, 2024 09:53
@openshift-ci openshift-ci bot requested review from jpodivin and slagle November 5, 2024 09:53
@fao89 fao89 requested review from rabi and removed request for jpodivin November 5, 2024 12:52
Depends-On: openstack-k8s-operators/heat-operator#463

ref OSPRH-10965

Signed-off-by: Fabricio Aguiar <[email protected]>
Copy link

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/53fbccf0cbce4814ba96e526cbc84c58

openstack-k8s-operators-content-provider FAILURE in 11m 52s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ openstack-operator-tempest-multinode SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
openstack-operator-docs-preview POST_FAILURE in 1m 38s

@fao89
Copy link
Contributor Author

fao89 commented Nov 5, 2024

/retest

@fao89
Copy link
Contributor Author

fao89 commented Nov 5, 2024

recheck

Copy link

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/78e6ed93d89e486ca89416dfbb290b1d

openstack-k8s-operators-content-provider FAILURE in 10m 31s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ openstack-operator-tempest-multinode SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
✔️ openstack-operator-docs-preview SUCCESS in 1m 53s

@fao89
Copy link
Contributor Author

fao89 commented Nov 5, 2024

recheck

Copy link
Contributor

openshift-ci bot commented Nov 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bshephar, fao89

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

@fao89
Copy link
Contributor Author

fao89 commented Nov 6, 2024

/retest

@openshift-merge-bot openshift-merge-bot bot merged commit b977d2e into openstack-k8s-operators:main Nov 6, 2024
8 checks passed
@fao89
Copy link
Contributor Author

fao89 commented Jan 10, 2025

need to wait openstack-k8s-operators/heat-operator#487 to cherrypick

@fao89
Copy link
Contributor Author

fao89 commented Jan 10, 2025

/cherry-pick 18.0-fr1

@openshift-cherrypick-robot

@fao89: #1163 failed to apply on top of branch "18.0-fr1":

Applying: Set Heat timeout
Using index info to reconstruct a base tree...
M	apis/core/v1beta1/openstackcontrolplane_webhook.go
M	tests/functional/ctlplane/openstackoperator_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/functional/ctlplane/openstackoperator_controller_test.go
CONFLICT (content): Merge conflict in tests/functional/ctlplane/openstackoperator_controller_test.go
Auto-merging apis/core/v1beta1/openstackcontrolplane_webhook.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Set Heat timeout

In response to this:

/cherry-pick 18.0-fr1

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.

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