github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-06-28 03:01:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Synthetics] Fix e2e (#137194)

Browse source 
* fix e2e

* update test
This commit is contained in:
Shahzad 2022-07-26 23:40:07 +02:00 • committed by GitHub
parent 1327c88117
commit 8b0d873e1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 6691 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.buildkite/scripts/pipelines/pull_request/pipeline.ts
View file

@ -114,10 +114,9 @@ const uploadPipeline = (pipelineContent: string | object) => {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/observability_plugin.yml')); pipeline.push(getPipeline('.buildkite/pipelines/pull_request/observability_plugin.yml'));
} }
// Skipped due to https://github.com/elastic/kibana/issues/137185 if (await doAnyChangesMatch([/^x-pack\/plugins\/synthetics/])) {
// if (await doAnyChangesMatch([/^x-pack\/plugins\/synthetics/])) { pipeline.push(getPipeline('.buildkite/pipelines/pull_request/synthetics_plugin.yml'));
// pipeline.push(getPipeline('.buildkite/pipelines/pull_request/synthetics_plugin.yml')); }
// }
if (await doAnyChangesMatch([/^x-pack\/plugins\/ux/])) { if (await doAnyChangesMatch([/^x-pack\/plugins\/ux/])) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/ux_plugin_e2e.yml')); pipeline.push(getPipeline('.buildkite/pipelines/pull_request/ux_plugin_e2e.yml'));

15
vars/tasks.groovy
View file

@ -156,14 +156,13 @@ def functionalXpack(Map params = [:]) {
} }
} }
// Skipped, process is hanging https://github.com/elastic/kibana/issues/137185 whenChanged([
// whenChanged([ 'x-pack/plugins/synthetics/',
// 'x-pack/plugins/synthetics/', ]) {
// ]) { if (githubPr.isPr()) {
// if (githubPr.isPr()) { task(kibanaPipeline.functionalTestProcess('xpack-UptimePlaywright', './test/scripts/jenkins_uptime_playwright.sh'))
// task(kibanaPipeline.functionalTestProcess('xpack-UptimePlaywright', './test/scripts/jenkins_uptime_playwright.sh')) }
// } }
// }
whenChanged([ whenChanged([
'x-pack/plugins/ux/', 'x-pack/plugins/ux/',

BIN
x-pack/plugins/synthetics/e2e/fixtures/es_archiver/synthetics_data/data.json.gz
View file

Binary file not shown.

6673
x-pack/plugins/synthetics/e2e/fixtures/es_archiver/synthetics_data/mappings.json
View file

File diff suppressed because it is too large Load diff

6
x-pack/plugins/synthetics/e2e/synthetics_run.ts
View file

@ -25,11 +25,7 @@ async function runE2ETests({ readConfigFile }: FtrConfigProviderContext) {
await syntheticsRunner.setup(); await syntheticsRunner.setup();
const fixturesDir = path.join(__dirname, '../e2e/fixtures/es_archiver/'); const fixturesDir = path.join(__dirname, '../e2e/fixtures/es_archiver/');
await syntheticsRunner.loadTestData(fixturesDir, [ await syntheticsRunner.loadTestData(fixturesDir, ['full_heartbeat', 'browser']);
'full_heartbeat',
'browser',
'synthetics_data',
]);
await syntheticsRunner.loadTestFiles(async () => { await syntheticsRunner.loadTestFiles(async () => {
require('./journeys'); require('./journeys');

4
x-pack/plugins/synthetics/scripts/base_e2e.js
View file

@ -72,7 +72,9 @@ function executeSyntheticsRunner(dirPath) {
); );
} else if (runner) { } else if (runner) {
childProcess.execSync( childProcess.execSync(
`node ../../../../scripts/${ftrScript} --config ${config} --kibana-install-dir '${kibanaInstallDir}' --headless ${headless} --bail ${pauseOnError} --grep '${grep}'`, `node ../../../../scripts/${ftrScript} --config ${config} --kibana-install-dir '${kibanaInstallDir}' --headless ${headless} --bail ${pauseOnError} ${
grep ? '--grep ' + grep : ''
}`,
{ {
cwd: dirPath, cwd: dirPath,
stdio: 'inherit', stdio: 'inherit',