Skip to content

fix: Allow overriding model in integration tests #3372

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
+1 −1
Closed

fix: Allow overriding model in integration tests #3372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/integration-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ if [[ -n "$TEST_SUBDIRS" ]]; then
EXTRA_PARAMS="$EXTRA_PARAMS --text-model=$TEXT_MODEL --embedding-model=sentence-transformers/all-MiniLM-L6-v2"
else
PYTEST_TARGET="tests/integration/"
EXTRA_PARAMS="$EXTRA_PARAMS --suite=$TEST_SUITE"
Copy link
Contributor

Choose a reason for hiding this comment

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

this was intentionally not done. the model comes as part of the "test suite" definition. I think it is unsatisfactory and am working to make it slightly better. however, can you tell me what broke -- what your use case was?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've been keeping the vLLM ci PR up to date #3128,
One of the reasons that the latest rebase fails was because the model name was incorrect

Copy link
Collaborator

Choose a reason for hiding this comment

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

the suites need to somehow key off provider. maybe detect the provider that's active (i'm already not a fan of --provider)? https://github.com/llamastack/llama-stack/blob/main/tests/integration/suites.py#L28 is only setup for ollama.

we have multiple ways to set the model for testing. what if suite only specified the set of tests to run, not the models?

Copy link
Contributor

Choose a reason for hiding this comment

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

#3390

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks, I've closed this and updated the CI PR

EXTRA_PARAMS="$EXTRA_PARAMS --text-model=$TEXT_MODEL --suite=$TEST_SUITE"
fi

set +e
Expand Down