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

bumping main to 3.0 #329

Merged
merged 1 commit into from
Oct 31, 2022
Merged

Conversation

amitgalitz
Copy link
Member

Signed-off-by: Amit Galitzky amgalitz@amazon.com

Description

bumping main to 3.0 branch

Issues Resolved

#290

Check List

  • Commits are signed per the DCO using --signoff

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.

Signed-off-by: Amit Galitzky <amgalitz@amazon.com>
@amitgalitz amitgalitz requested a review from a team October 24, 2022 18:58
@opensearch-trigger-bot opensearch-trigger-bot bot added backport 2.x github actions Updating or adding GitHub actions labels Oct 24, 2022
@amitgalitz
Copy link
Member Author

Remote integ tests are flaky here:
Run 1: 3 of 8 test suites had failures
Run 2 : 4 of 8 test suites had failures
Run 3: It couldn't find job-scheduler 3.0.0 zip even though it was found for previous 2 runs

@amitgalitz
Copy link
Member Author

Job scheduler is currently failing for 3.x so we can't successfully run CI here: opensearch-project/job-scheduler#249
On a side note: In my opinion we really should be careful how much time we decide to spend to get main stable cause if we are constantly having breaking changes from core and other dependencies it can create a constant loop of maintenance that will slow down our development speed.

@ohltyler
Copy link
Member

I think it's worth keeping an eye out on the amount of effort needed to remain compatible with the next major version / 3.0. The main idea is that it's supposed to be the 'cutting edge' branch that will have all of the newest changes in it, and it eases the amount of effort we will have to make during a 3.0 release since we will have already done the work to be compatible with it based on all of the breaking changes in it as they are merged. But 3.0 shouldn't consistently break - if so, it's worth further discussion and probably opening a ticket in https://github.com/opensearch-project/opensearch-plugins

@ohltyler
Copy link
Member

@amitgalitz actually looks like there's a good thread about this here: opensearch-project/opensearch-plugins#142 (comment)

@amitgalitz
Copy link
Member Author

The remote tests have been extra flaky on this PR. The create AD test suite is failing more consistently with this error: Expected to find element: [data-test-subj="defineOrEditDetectorTitle"], but never found it.
Looking into it currently but locally every single integ is failing for me, probably something I missed in my set up with the version bump but if not, I'll open an issue in FTRepo.

@amitgalitz
Copy link
Member Author

@jackiehanyang could the failure on windows-ci PR be related to this not being merged yet?

@jackiehanyang
Copy link
Collaborator

@jackiehanyang could the failure on windows-ci PR be related to this not being merged yet?

I think the Remote integ tests workflow / Run integ tests without security workflow failure is related to this pr not being merged yet. Because it's also failing in this PR. Do we have plan to fix it in this PR or it's gonna be merged with failed CI?

The new workflow Unit tests workflow / Run unit tests (windows-latest) is also failing for windows-ci. This one is not related to this pr

@ohltyler
Copy link
Member

@jackiehanyang can we merge this? Sounds like CI failures are going to be fixed with #330?

@jackiehanyang
Copy link
Collaborator

@jackiehanyang can we merge this? Sounds like CI failures are going to be fixed with #330?

no I don't think the CI failure will be fixed with #330, the CI failure looks like related to 3.0 specifically. Also let's 2.4 windows pr merged before this since it has a higher priority

@ohltyler ohltyler linked an issue Oct 31, 2022 that may be closed by this pull request
@jackiehanyang
Copy link
Collaborator

looked into the error message for failed remote integ tests workflow. It's failing due to flaky integ tests, nothing related to 3.0 specific issue. So it's good to merge @ohltyler

@jackiehanyang jackiehanyang merged commit 536171d into opensearch-project:main Oct 31, 2022
@ohltyler
Copy link
Member

@jackiehanyang fyi, because I linked the issue, it would have closed automatically when merging :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
github actions Updating or adding GitHub actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Implement OpenSearch core branching strategy
3 participants