[Synthetics] Fix e2e (#137194)

* 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

View file

@ -114,10 +114,9 @@ const uploadPipeline = (pipelineContent: string | object) => {
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/])) {
// pipeline.push(getPipeline('.buildkite/pipelines/pull_request/synthetics_plugin.yml'));
// }
if (await doAnyChangesMatch([/^x-pack\/plugins\/synthetics/])) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/synthetics_plugin.yml'));
}
if (await doAnyChangesMatch([/^x-pack\/plugins\/ux/])) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/ux_plugin_e2e.yml'));

View file

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

View file

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

View file

@ -72,7 +72,9 @@ function executeSyntheticsRunner(dirPath) {
);
} else if (runner) {
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,
stdio: 'inherit',