Skip to content

Commit

Permalink
Merge branch 'performance-runner-in-js' of github.com:lizozom/kibana …
Browse files Browse the repository at this point in the history
…into performance-runner-in-js
  • Loading branch information
lizozom committed Nov 24, 2022
2 parents 885d0d8 + 5b533f4 commit 8c0604b
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/dev/performance/run_performance_cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ import path from 'path';
run(
async ({ log, flagsReader, procRunner }) => {
async function runFunctionalTest(journey: string, phase: 'TEST' | 'WARMUP') {

// Pass in a clean APM environemnt, so that FTR can later
// Pass in a clean APM environemnt, so that FTR can later
// set it's own values.
const cleanApmEnv = {
ELASTIC_APM_TRANSACTION_SAMPLE_RATE: undefined,
Expand All @@ -24,7 +23,7 @@ run(
ELASTIC_APM_ACTIVE: undefined,
ELASTIC_APM_CONTEXT_PROPAGATION_ONLY: undefined,
ELASTIC_APM_GLOBAL_LABELS: undefined,
}
};

await procRunner.run('functional-tests', {
cmd: 'node',
Expand All @@ -37,7 +36,7 @@ run(
].flat(),
cwd: REPO_ROOT,
wait: true,
env: {
env: {
TEST_PERFORMANCE_PHASE: phase,
TEST_ES_URL: 'http://elastic:changeme@localhost:9200',
TEST_ES_DISABLE_STARTUP: 'true',
Expand Down

0 comments on commit 8c0604b

Please sign in to comment.