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

Replaced docker-compose with docker compose in Makefile #848

Merged
merged 9 commits into from
Aug 20, 2024

Conversation

nhtruong
Copy link
Collaborator

@nhtruong nhtruong commented Aug 20, 2024

closes #845

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.

Locking Gradle version to 8.9

Signed-off-by: Theo Truong <theotr@amazon.com>
Signed-off-by: Theo Truong <theotr@amazon.com>
Signed-off-by: Theo Truong <theotr@amazon.com>
@nhtruong nhtruong marked this pull request as ready for review August 20, 2024 16:58
Copy link
Member

@dblock dblock left a comment

Choose a reason for hiding this comment

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

Let's not lose tests against 1.x. Add the JDK version to the matrix and install that one instead of 17.

https://github.com/opensearch-project/opensearch-py/blob/main/.github/workflows/integration-unreleased.yml#L12

Makefile Outdated Show resolved Hide resolved
@nhtruong
Copy link
Collaborator Author

nhtruong commented Aug 20, 2024

Let's not lose tests against 1.x. Add the JDK version to the matrix and install that one instead of 17.

@dblock Got it. Should we we remove that for 3.x client as its generated API no longer accept doc_type in OS 1.x?

@dblock
Copy link
Member

dblock commented Aug 20, 2024

Let's not lose tests against 1.x. Add the JDK version to the matrix and install that one instead of 17.

@dblock Got it. Should we we remove that for 3.x client as its generated API no longer accept doc_type in OS 1.x?

If we do remove 1.x support then yes. I would take a hard look at the possibility of preserving 1.x support though because a very large number of users are still on 1.x and we would love for them to upgrade.

Signed-off-by: Theo Truong <theotr@amazon.com>
# Active mechanism to check for cluster readiness
Signed-off-by: Theo Truong <theotr@amazon.com>
Signed-off-by: Theo Truong <theotr@amazon.com>
Signed-off-by: Theo Truong <theotr@amazon.com>
Signed-off-by: Theo Truong <theotr@amazon.com>
Signed-off-by: Theo Truong <theotr@amazon.com>
@nhtruong
Copy link
Collaborator Author

@dblock all issues resolved. I also replaced sleep 90 with an active health check script.

@dblock dblock merged commit acee732 into opensearch-project:main Aug 20, 2024
64 of 65 checks passed
@nhtruong nhtruong deleted the fix_makefile branch August 20, 2024 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Workflows using Makefile are failing
2 participants