This repository has been archived by the owner on Oct 7, 2022. It is now read-only.
Fix snapshot build and depend on OpenSearch 1.1. #62
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
Signed-off-by: dblock <dblock@amazon.com>
kartg
approved these changes
Aug 17, 2021
| @@ -29,7 +29,10 @@ import java.util.concurrent.Callable | |||
|
|
|||
| buildscript { | |||
| ext { | |||
| opensearch_version = System.getProperty("opensearch.version", "1.0.0") | |||
| opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT") | |||
There was a problem hiding this comment.
Using 1.1.0-SNAPSHOT as a default seems like something that would fall out of date very easily. Could we simply error out if opensearch.version isn't set?
There was a problem hiding this comment.
We could. But we do this in so many plugins, so I'd prefer to do this as a separate issue/PR, and standardize across the set.
Comment on lines
+33
to
+34
| // 1.0.0 -> 1.0.0.0, and 1.0.0-SNAPSHOT -> 1.0.0.0-SNAPSHOT | ||
| opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2') |
There was a problem hiding this comment.
Why do we want to implicitly morph the incoming version with an extra .0 ?
There was a problem hiding this comment.
For historical reasons OpenSearch is a 3-digit version, so you start with 1.1.0 or 1.1.0-SNAPSHOT, but common utils and plugins are 4-digit, so 1.1.0.0 and 1.1.0.0-SNAPSHOT. We have opensearch-project/OpenSearch#1093 open to stop doing that.
There was a problem hiding this comment.
This is just a clever(er) way of doing opensearch_version - '-SNAPSHOT' + '.0' + ('-SNAPSHOT' if opensearch_version.contains('-SNAPSHOT') else '').
joshuali925
added a commit
that referenced
this pull request
Sep 20, 2021
* Remove dependency on dashboards version for requests (#48) * Remove dependency on dashboards version Signed-off-by: Joshua Li <joshuali925@gmail.com> * Update release notes Signed-off-by: Joshua Li <joshuali925@gmail.com> * Fix data schema Signed-off-by: Joshua Li <joshuali925@gmail.com> * Memoize QueryDataGrid to Reduce Re-renders (#49) * Memoize query data grid to avoid unnecessary re-renders on query paragraphs Signed-off-by: David Cui <davidcui@amazon.com> * remove notebook.tsx changes Signed-off-by: David Cui <davidcui@amazon.com> * remove unused export of QueryDataGrid to avoid accidental import Signed-off-by: David Cui <davidcui@amazon.com> * Add sample notebooks (#50) * Add sample notebooks Signed-off-by: Joshua Li <joshuali925@gmail.com> * Add loading state Signed-off-by: Joshua Li <joshuali925@gmail.com> * Update cypress tests Signed-off-by: Joshua Li <joshuali925@gmail.com> * Update release notes Signed-off-by: Joshua Li <joshuali925@gmail.com> * Improve sample notebooks wording (#51) * Update sample notebooks wording Signed-off-by: Joshua Li <joshuali925@gmail.com> * Adjust notebook heading UI Signed-off-by: Joshua Li <joshuali925@gmail.com> * Fix browser back button Signed-off-by: Joshua Li <joshuali925@gmail.com> * Revert "Fix browser back button" This reverts commit 4fd31cd. Signed-off-by: Joshua Li <joshuali925@gmail.com> * Add cypress test suite for reporting context menu (#52) * add cypress test suite for reporting context menu Signed-off-by: David Cui <davidcui@amazon.com> * remove command to click cancel button on loading modal Signed-off-by: David Cui <davidcui@amazon.com> * Report tenant support (#54) * add tenant support for Notebooks reporting Signed-off-by: David Cui <davidcui@amazon.com> * remove console log statements Signed-off-by: David Cui <davidcui@amazon.com> * Fix IT for notebooks frontend and backend (#56) * Test CI Signed-off-by: Joshua Li <joshuali925@gmail.com> * Test CI 2 Signed-off-by: Joshua Li <joshuali925@gmail.com> * Remove opendistro Signed-off-by: Joshua Li <joshuali925@gmail.com> * Update cypress test Signed-off-by: Joshua Li <joshuali925@gmail.com> * Add Integtest.sh for OpenSearch integtest setups (#55) * Add integtest script to the repo Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Improve osd bootstrap on dub directory Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Improve osd bootstrap on dub directory Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Improve wording for sample notebooks (#57) * Update sample notebooks wording Signed-off-by: Joshua Li <joshuali925@gmail.com> * Update documentation links Signed-off-by: Joshua Li <joshuali925@gmail.com> * Fix broken links Signed-off-by: Joshua Li <joshuali925@gmail.com> * Fix snapshot build and depend on OpenSearch 1.1. (#62) Signed-off-by: dblock <dblock@amazon.com> * Add release notes for 1.0.1 release (#65) * Bump version for opensearch 1.1.0 release (#70) * Update release notes for 1.1.0 release (#71) Signed-off-by: Joshua Li <joshuali925@gmail.com> * Bump opensearch ref to 1.1 in CI (#73) Co-authored-by: David Cui <53581635+davidcui-amzn@users.noreply.github.com> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: Daniel Doubrovkine (dB.) <dblock@dblock.org>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Signed-off-by: dblock dblock@amazon.com
Description
Fixes snapshot build, defaults to it in CI, takes a dependency and inherits version from OpenSearch 1.1.
Issues Resolved
Closes #60
Check List
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.