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

Update deprecated openAI mode in integration test and fix flaky tests #1846

Merged
merged 11 commits into from
Jan 12, 2024

Conversation

Hailong-am
Copy link
Contributor

@Hailong-am Hailong-am commented Jan 9, 2024

Description

This PR includes changes for below items

  1. pick from fix flaky test due to localization #1734
  2. part of Fix sort on get trace API and flaky test of conversation #1733
  3. replace deprecated openAI mode in integration test
  4. update default admin password for integration test with docker run
  5. fix getConversations when index not exists missing return

Issues Resolved

#1848 and #1849

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

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: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Zhangxunmt
Zhangxunmt previously approved these changes Jan 12, 2024
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
@ylwu-amzn ylwu-amzn merged commit 6584529 into opensearch-project:main Jan 12, 2024
11 of 14 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1846-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6584529ebc4554d25d8ba664913b2fab7e644c0e
# Push it to GitHub
git push --set-upstream origin backport/backport-1846-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

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

Hailong-am added a commit to Hailong-am/ml-commons that referenced this pull request Jan 12, 2024
…opensearch-project#1846)

* Fix flaky test

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* remove unused import

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* replace deprecated openAI model in test

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* ignore testOpenAIEditsModel as it's deprecated

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* typo fix

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* update admin password

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* fix getConversations when index not exists

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* update blueprint doc

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* update edit model to gpt-4

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* remove hardcode password

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* replace deprecating set-output

Signed-off-by: Hailong Cui <ihailong@amazon.com>

---------

Signed-off-by: Hailong Cui <ihailong@amazon.com>
(cherry picked from commit 6584529)
ylwu-amzn pushed a commit that referenced this pull request Jan 12, 2024
…#1846) (#1858)

* Fix flaky test

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* remove unused import

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* replace deprecated openAI model in test

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* ignore testOpenAIEditsModel as it's deprecated

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* typo fix

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* update admin password

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* fix getConversations when index not exists

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* update blueprint doc

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* update edit model to gpt-4

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* remove hardcode password

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* replace deprecating set-output

Signed-off-by: Hailong Cui <ihailong@amazon.com>

---------

Signed-off-by: Hailong Cui <ihailong@amazon.com>
(cherry picked from commit 6584529)
austintlee pushed a commit to austintlee/ml-commons that referenced this pull request Mar 19, 2024
…opensearch-project#1846)

* Fix flaky test

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* remove unused import

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* replace deprecated openAI model in test

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* ignore testOpenAIEditsModel as it's deprecated

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* typo fix

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* update admin password

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* fix getConversations when index not exists

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* update blueprint doc

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* update edit model to gpt-4

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* remove hardcode password

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* replace deprecating set-output

Signed-off-by: Hailong Cui <ihailong@amazon.com>

---------

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants