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

Removing extra protobuf notice file #10114

Merged
merged 2 commits into from
Sep 21, 2023

Conversation

VachaShah
Copy link
Collaborator

Description

Same as title

Related Issues

Resolves #9287

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 18, 2023

Compatibility status:

Checks if related components are compatible with change 34cbc6b

Incompatible components

Incompatible components: [https://github.com/opensearch-project/k-nn.git]

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/neural-search.git]

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@VachaShah
Copy link
Collaborator Author

Gradle Check (Jenkins) Run Completed with:

Flaky test reported in #10133

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@VachaShah
Copy link
Collaborator Author

Gradle Check (Jenkins) Run Completed with:

More flaky tests reported in #10006, #8887

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@VachaShah
Copy link
Collaborator Author

Gradle Check (Jenkins) Run Completed with:

Flaky test reported in #10133

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@VachaShah
Copy link
Collaborator Author

Gradle Check (Jenkins) Run Completed with:

Flaky tests in #7357 and #10133

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@VachaShah
Copy link
Collaborator Author

Gradle Check (Jenkins) Run Completed with:

Flaky test again #10006

@kotwanikunal
Copy link
Member

Ugh. This gradle check history is bad. :(
@VachaShah can you try rebasing instead? That might fix your problems :)

@VachaShah
Copy link
Collaborator Author

Ugh. This gradle check history is bad. :( @VachaShah can you try rebasing instead? That might fix your problems :)

Yeah :( I just force pushed with a rebase. Thank you!

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@VachaShah
Copy link
Collaborator Author

Gradle Check (Jenkins) Run Completed with:

testPrimaryTermValidation failing again. #10133

@VachaShah
Copy link
Collaborator Author

@kotwanikunal Any suggestions to get a clean gradle check? :(

@kotwanikunal
Copy link
Member

@kotwanikunal Any suggestions to get a clean gradle check? :(

I wish there was another way out. I re-ran it 🤞

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.SearchWeightedRoutingIT.testMultiGetWithNetworkDisruption_FailOpenEnabled
      1 org.opensearch.remotestore.RemoteStoreStatsIT.testStatsResponseFromAllNodes
      1 org.opensearch.index.shard.RemoteIndexShardTests.testRepicaCleansUpOldCommitsWhenReceivingNew

@kotwanikunal
Copy link
Member

@VachaShah 🎊

@kotwanikunal kotwanikunal merged commit 05ee0c3 into opensearch-project:main Sep 21, 2023
13 checks passed
@VachaShah
Copy link
Collaborator Author

@VachaShah 🎊

Finally 🎊 Thanks @kotwanikunal!

@VachaShah VachaShah added the backport 2.x Backport to 2.x branch label Sep 22, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-10114-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 05ee0c3f3f8b347371a9f77f89023d1ec9851707
# Push it to GitHub
git push --set-upstream origin backport/backport-10114-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-10114-to-2.x.

sarthakaggarwal97 pushed a commit to sarthakaggarwal97/OpenSearch that referenced this pull request Sep 24, 2023
* Removing the extra protobuf java notice from root

Signed-off-by: Vacha Shah <[email protected]>

* Fixing precommit errors

Signed-off-by: Vacha Shah <[email protected]>

---------

Signed-off-by: Vacha Shah <[email protected]>
brusic pushed a commit to brusic/OpenSearch that referenced this pull request Sep 25, 2023
* Removing the extra protobuf java notice from root

Signed-off-by: Vacha Shah <[email protected]>

* Fixing precommit errors

Signed-off-by: Vacha Shah <[email protected]>

---------

Signed-off-by: Vacha Shah <[email protected]>
Signed-off-by: Ivan Brusic <[email protected]>
vikasvb90 pushed a commit to vikasvb90/OpenSearch that referenced this pull request Oct 10, 2023
* Removing the extra protobuf java notice from root

Signed-off-by: Vacha Shah <[email protected]>

* Fixing precommit errors

Signed-off-by: Vacha Shah <[email protected]>

---------

Signed-off-by: Vacha Shah <[email protected]>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
* Removing the extra protobuf java notice from root

Signed-off-by: Vacha Shah <[email protected]>

* Fixing precommit errors

Signed-off-by: Vacha Shah <[email protected]>

---------

Signed-off-by: Vacha Shah <[email protected]>
Signed-off-by: Shivansh Arora <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport-failed bug Something isn't working Plugins skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Empty protobuf-java-NOTICE.txt file in project root
5 participants