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

Fix snapshot assemble and build 1.1.0. #176

Merged
merged 3 commits into from
Aug 16, 2021

Conversation

dblock
Copy link
Member

@dblock dblock commented Aug 14, 2021

Requires opensearch-project/common-utils#58 and opensearch-project/job-scheduler#49, and cleaned up on top of #175.

Signed-off-by: dblock dblock@amazon.com

Description

Fix assembly with -Dbuild.snapshot=true. The full syntax required passing the version of job scheduler and common utils, which would cause us to need a custom script for the bundle build. Changed build.gradle to default those to the same build as OpenSearch (e.g. 1.0.0 becomes 1.0.0.0 and 1.0.0-SNAPSHOT becomes 1.0.0.0-SNAPSHOT).

So to build a snapshot:

./gradlew assemble --no-daemon --refresh-dependencies -DskipTests=true -Dopensearch.version=1.0.0-SNAPSHOT -Dbuild.snapshot=true

Issues Resolved

Closes #173.

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.

@dblock dblock requested a review from ylwu-amzn August 14, 2021 18:05
@dblock dblock marked this pull request as draft August 14, 2021 18:57
@dblock dblock changed the title Fix snapshot assemble. Fix snapshot assemble and build 1.1.0. Aug 16, 2021
Signed-off-by: dblock <dblock@amazon.com>
Signed-off-by: dblock <dblock@amazon.com>
@dblock dblock force-pushed the fix-snapshot-build branch 2 times, most recently from b9eead5 to acfc26c Compare August 16, 2021 15:31
Signed-off-by: dblock <dblock@amazon.com>
@dblock dblock marked this pull request as ready for review August 16, 2021 16:41
@dblock dblock requested a review from VachaShah August 16, 2021 16:41
@@ -33,7 +33,7 @@ jobs:
with:
repository: 'opensearch-project/OpenSearch'
path: OpenSearch
ref: 'main'
ref: '1.x'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we changing the branch ref for OpenSearch to 1.x from main? Wouldn't main of anomaly-detection refer to main of OpenSearch and 1.x of anomaly-detection refer to 1.x of OpenSearch?

Copy link
Member Author

@dblock dblock Aug 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OpenSearch is already developing a 2.0 on main, and 1.1 on the 1.x branch.

None of the plugins I know have a 2.0 line yet, and are developing 1.1 on main.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still see the 1.1.0 version in OpenSearch main: https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties#L1. Let me know if I am not looking at the right place.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That should get updated to 2.0 but it will break the world. We've only be backporting 1.x changes into 1.x.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it!

@kaituo kaituo mentioned this pull request Aug 16, 2021
1 task
@dblock dblock merged commit 878918e into opensearch-project:main Aug 16, 2021
ohltyler pushed a commit to ohltyler/anomaly-detection-2 that referenced this pull request Sep 1, 2021
ohltyler pushed a commit to ohltyler/anomaly-detection-2 that referenced this pull request Sep 1, 2021
ohltyler pushed a commit that referenced this pull request Sep 1, 2021
@ohltyler ohltyler added the infra Changes to infrastructure, testing, CI/CD, pipelines, etc. label Sep 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
infra Changes to infrastructure, testing, CI/CD, pipelines, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Snapshot build is broken
3 participants