ossm: add merge_upstream.sh to do merges of upstream commits #14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dgn
commented
Apr 23, 2024
dgn
added a commit
to dgn/sail-operator
that referenced
this pull request
Apr 23, 2024
This is required for openshift-service-mesh#14 Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
|
/retest |
istio-testing
pushed a commit
to istio-ecosystem/sail-operator
that referenced
this pull request
Apr 23, 2024
This is required for openshift-service-mesh#14 Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
FilipB
reviewed
Apr 23, 2024
Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
|
@dgn: The following test failed, say
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/test-infra repository. I understand the commands that are listed here. |
|
/test e2e-ocp-4-16 |
openshift-merge-bot
bot
merged commit 7cefe83
into
openshift-service-mesh:main
8 of 9 checks passed
openshift-merge-bot bot
pushed a commit
that referenced
this pull request
Apr 24, 2024
…ator@main (#17) * Use INFO level to log missing namespace in IstioRevision/IstioCNI (#64) Signed-off-by: Marko Lukša <mluksa@redhat.com> * Ensure control plane is deployed immediately when the target namespace is created (#65) Signed-off-by: Marko Lukša <mluksa@redhat.com> * Automator: Update dependencies in istio-ecosystem/sail-operator@main (#66) Signed-off-by: istio-testing <istio-testing-bot@google.com> * Update SetDefaultEventuallyTimeout for e2e test (#69) Signed-off-by: frherrer <frherrer@redhat.com> * Ensure CI highlights failure in lint-watches.sh (#70) Signed-off-by: Marko Lukša <mluksa@redhat.com> * Make lint-watches ignore ValidatingAdmissionPolicy(Binding) (#71) Signed-off-by: Marko Lukša <mluksa@redhat.com> * Ensure update-istio.sh updates version field in versions.yaml (#72) Signed-off-by: Marko Lukša <mluksa@redhat.com> * Wrap errors to provide context (#68) * Wrap errors to provide context Signed-off-by: Marko Lukša <mluksa@redhat.com> * Add called function instead of the caller to error message Signed-off-by: Marko Lukša <mluksa@redhat.com> * Fix lint errors Signed-off-by: Marko Lukša <mluksa@redhat.com> * Fix test Signed-off-by: Marko Lukša <mluksa@redhat.com> --------- Signed-off-by: Marko Lukša <mluksa@redhat.com> * Make bundle generation work during merges (#73) This is required for #14 Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Refactor (#76) * Merge if statements Signed-off-by: Marko Lukša <mluksa@redhat.com> * Replace multiple ifs with switch Signed-off-by: Marko Lukša <mluksa@redhat.com> --------- Signed-off-by: Marko Lukša <mluksa@redhat.com> * Automator: Update dependencies in istio-ecosystem/sail-operator@main (#67) Signed-off-by: istio-testing <istio-testing-bot@google.com> --------- Signed-off-by: Marko Lukša <mluksa@redhat.com> Signed-off-by: istio-testing <istio-testing-bot@google.com> Signed-off-by: frherrer <frherrer@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> Co-authored-by: Marko Lukša <mluksa@redhat.com> Co-authored-by: Istio Automation <istio-testing-bot@google.com> Co-authored-by: Francisco Herrera <frherrer@redhat.com> Co-authored-by: Daniel Grimm <dgrimm@redhat.com> Co-authored-by: openshift-service-mesh-bot <null>
openshift-merge-bot bot
pushed a commit
that referenced
this pull request
Apr 24, 2024
…ator@main (#18) * Use INFO level to log missing namespace in IstioRevision/IstioCNI (#64) Signed-off-by: Marko Lukša <mluksa@redhat.com> * Ensure control plane is deployed immediately when the target namespace is created (#65) Signed-off-by: Marko Lukša <mluksa@redhat.com> * Automator: Update dependencies in istio-ecosystem/sail-operator@main (#66) Signed-off-by: istio-testing <istio-testing-bot@google.com> * Update SetDefaultEventuallyTimeout for e2e test (#69) Signed-off-by: frherrer <frherrer@redhat.com> * Ensure CI highlights failure in lint-watches.sh (#70) Signed-off-by: Marko Lukša <mluksa@redhat.com> * Make lint-watches ignore ValidatingAdmissionPolicy(Binding) (#71) Signed-off-by: Marko Lukša <mluksa@redhat.com> * Ensure update-istio.sh updates version field in versions.yaml (#72) Signed-off-by: Marko Lukša <mluksa@redhat.com> * Wrap errors to provide context (#68) * Wrap errors to provide context Signed-off-by: Marko Lukša <mluksa@redhat.com> * Add called function instead of the caller to error message Signed-off-by: Marko Lukša <mluksa@redhat.com> * Fix lint errors Signed-off-by: Marko Lukša <mluksa@redhat.com> * Fix test Signed-off-by: Marko Lukša <mluksa@redhat.com> --------- Signed-off-by: Marko Lukša <mluksa@redhat.com> * Make bundle generation work during merges (#73) This is required for #14 Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Refactor (#76) * Merge if statements Signed-off-by: Marko Lukša <mluksa@redhat.com> * Replace multiple ifs with switch Signed-off-by: Marko Lukša <mluksa@redhat.com> --------- Signed-off-by: Marko Lukša <mluksa@redhat.com> * Automator: Update dependencies in istio-ecosystem/sail-operator@main (#67) Signed-off-by: istio-testing <istio-testing-bot@google.com> --------- Signed-off-by: Marko Lukša <mluksa@redhat.com> Signed-off-by: istio-testing <istio-testing-bot@google.com> Signed-off-by: frherrer <frherrer@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> Co-authored-by: Marko Lukša <mluksa@redhat.com> Co-authored-by: Istio Automation <istio-testing-bot@google.com> Co-authored-by: Francisco Herrera <frherrer@redhat.com> Co-authored-by: Daniel Grimm <dgrimm@redhat.com> Co-authored-by: openshift-service-mesh-bot <null>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sadly, just merging commits isn't enough, we also need to re-generate some files. To not over-complicate the automator script, I put it into a separate script that we can call from the automator.