Skip to content

Automator: merge upstream changes to openshift-service-mesh/sail-operator@release-3.0#258

Closed
openshift-service-mesh-bot wants to merge 4 commits intoopenshift-service-mesh:release-3.0from
openshift-service-mesh-bot:none-release-3.0-merge_upstream_release-1.0-a8adebe8
Closed

Automator: merge upstream changes to openshift-service-mesh/sail-operator@release-3.0#258
openshift-service-mesh-bot wants to merge 4 commits intoopenshift-service-mesh:release-3.0from
openshift-service-mesh-bot:none-release-3.0-merge_upstream_release-1.0-a8adebe8

Conversation

@openshift-service-mesh-bot
Copy link
Copy Markdown

@openshift-service-mesh-bot openshift-service-mesh-bot commented Feb 24, 2025 •
edited
Loading

Generated by Automator - 2025-02-26T10:38:58+00:00

@openshift-service-mesh-bot openshift-service-mesh-bot force-pushed the none-release-3.0-merge_upstream_release-1.0-a8adebe8 branch 7 times, most recently from 6e54bba to 7caa75c Compare February 25, 2025 15:15
@dgn
Copy link
Copy Markdown

dgn commented Feb 25, 2025

/retest

@openshift-service-mesh-bot openshift-service-mesh-bot force-pushed the none-release-3.0-merge_upstream_release-1.0-a8adebe8 branch from 7caa75c to 342fe98 Compare February 25, 2025 18:15
@FilipB FilipB mentioned this pull request Feb 25, 2025
Merged
@dgn
Copy link
Copy Markdown

dgn commented Feb 25, 2025

/retest

@yxun
Copy link
Copy Markdown

yxun commented Feb 25, 2025

/test e2e-ocp-4-16

@yxun
Copy link
Copy Markdown

yxun commented Feb 25, 2025

/test e2e-ocp-4-17

@openshift-service-mesh-bot openshift-service-mesh-bot force-pushed the none-release-3.0-merge_upstream_release-1.0-a8adebe8 branch 4 times, most recently from 8c944fd to fed7285 Compare February 26, 2025 06:20
@FilipB
Copy link
Copy Markdown

FilipB commented Feb 26, 2025

Tests are failing on 2025-02-26T03:51:19Z ERROR ctrlr.istiocni Reconciler error {"IstioCNI": "default", "reconcileID": "2864410d-07ea-43e4-a322-ab229801beb5", "error": "failed to apply profile: failed to get values from profile [\"default\" \"openshift\"]: failed to read profile file /var/lib/sail-operator/resources/v1.24.3/profiles/default.yaml: open /var/lib/sail-operator/resources/v1.24.3/profiles/default.yaml: no such file or directory"}

@fjglira @sridhargaddam
[Manual Cherry-pick to release-1.0 branch] e2e IstioRevisionTag test (o…
e1d5fb9 
…penshift-service-mesh#683)

* e2e revisiontag (openshift-service-mesh#656)

* Control plane update and IstioRevisionTag e2e test

Signed-off-by: Francisco H <frherrer@redhat.com>

Uncomment cleanup

Signed-off-by: Francisco H <frherrer@redhat.com>

Update clean up

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix lint

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix cleanup e2e test

Signed-off-by: Francisco H <frherrer@redhat.com>

Update cleanup

Signed-off-by: Francisco H <frherrer@redhat.com>

* Use istioversion in update test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Update from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* Solve from conflicts

Signed-off-by: Francisco H <frherrer@redhat.com>

* Update from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* Fix comment on istiorevision test

Signed-off-by: Francisco H <frherrer@redhat.com>

---------

Signed-off-by: Francisco H <frherrer@redhat.com>

* Capture ztunnel details on e2e failures (openshift-service-mesh#618)

Currently, when any ambient e2e test fails, we are not capturing
details of the ztunnel and the associated test pods. This PR updates
the code to include this info.

Signed-off-by: Sridhar Gaddam <sgaddam@redhat.com>

---------

Signed-off-by: Francisco H <frherrer@redhat.com>
Signed-off-by: Sridhar Gaddam <sgaddam@redhat.com>
Co-authored-by: Sridhar Gaddam <sgaddam@redhat.com>
@dgn
Copy link
Copy Markdown

dgn commented Feb 26, 2025

/retest

openshift-service-mesh-bot added 2 commits February 26, 2025 09:08
Automated merge
6bfc1ba 
* upstream/release-1.0:
  [Manual Cherry-pick to release-1.0 branch] e2e IstioRevisionTag test (openshift-service-mesh#683)
  [release-1.0] Updating dependencies and istio versions (openshift-service-mesh#673)
Automated regeneration
960af85
@openshift-service-mesh-bot openshift-service-mesh-bot force-pushed the none-release-3.0-merge_upstream_release-1.0-a8adebe8 branch from fed7285 to 960af85 Compare February 26, 2025 09:09
@dgn
Copy link
Copy Markdown

dgn commented Feb 26, 2025

/test lint

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Feb 26, 2025

@openshift-service-mesh-bot: 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-ocp-4-18 960af85 link false /test e2e-ocp-4-18

Full PR test history. Your PR dashboard.

Details

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.

@FilipB
Copy link
Copy Markdown

FilipB commented Feb 26, 2025

Not mergeable. PR has a merge conflict. It should be resolved automatically after next run of the sync upstream job

@FilipB
Copy link
Copy Markdown

FilipB commented Feb 26, 2025

Closing to let automator create a new one

@FilipB FilipB closed this Feb 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

auto-merge size/XXL tide/merge-method-merge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@openshift-service-mesh-bot @dgn @yxun @FilipB @fjglira