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.

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

test(edot): re-enable instr-elastic-openai test with fixed Ollama #591

Merged
merged 3 commits into from
Feb 12, 2025
+20 −24
Merged

test(edot): re-enable instr-elastic-openai test with fixed Ollama #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4214ffd
test(edot): re-enable instr-elastic-openai test with fixed Ollama
trentm Feb 6, 2025
0411309
try the 'ollama/ollama:0.5.8' Docker image out just yesterday
trentm Feb 11, 2025
6607efc
Merge branch 'main' into trentm/try-re-enable-openai-test-with-ollama…
trentm Feb 11, 2025
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
16 changes: 8 additions & 8 deletions .github/workflows/test-edot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,14 @@ jobs:
env:
MYSQL_ALLOW_EMPTY_PASSWORD: 1

# Disabled until https://github.com/ollama/ollama/issues/8400 is resolved.
# ollama:
# # A light fork of Ollama to float some in-progress contributions related
# # to more closely matching OpenAI behavior.
# image: ghcr.io/elastic/ollama/ollama:testing
# # image: ollama/ollama:0.5.7
# ports:
# - 11434:11434
ollama:
# A light fork of Ollama to float some in-progress contributions related
# to more closely matching OpenAI behavior.
# TODO: go back to this image when updated to 0.5.8 base?
# image: ghcr.io/elastic/ollama/ollama:testing
image: ollama/ollama:0.5.8
ports:
- 11434:11434

postgres:
image: postgres:16
Expand Down
28 changes: 12 additions & 16 deletions packages/opentelemetry-node/test/instr-elastic-openai.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,20 @@
const http = require('http');
const {basename} = require('path');
const test = require('tape');
// const semver = require('semver');
const semver = require('semver');
const {runTestFixtures, assertDeepMatch} = require('./testutils');

let skip = true;
console.log(
'# SKIP elastic/instr-openai test until https://github.com/ollama/ollama/issues/8400 is resolved'
);
// let skip = process.env.TEST_GENAI_MODEL === undefined;
// if (skip) {
// console.log(
// '# SKIP elastic openai tests: TEST_GENAI_MODEL is not set (load env from test/test-services.env)'
// );
// } else {
// skip = !semver.satisfies(process.version, '>=18');
// if (skip) {
// console.log('# SKIP elastic openai requires node >=18');
// }
// }
let skip = process.env.TEST_GENAI_MODEL === undefined;
if (skip) {
console.log(
'# SKIP elastic openai tests: TEST_GENAI_MODEL is not set (load env from test/test-services.env)'
);
} else {
skip = !semver.satisfies(process.version, '>=18');
if (skip) {
console.log('# SKIP elastic openai requires node >=18');
}
}

/** @type {import('./testutils').TestFixture[]} */
const testFixtures = [
Expand Down
Loading