Skip to content

Commit

Permalink
[APM] unskipping e2e tests (elastic#177949)
Browse files Browse the repository at this point in the history
  • Loading branch information
cauemarcondes authored Mar 6, 2024
1 parent 0164963 commit f327c2d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 10 deletions.
21 changes: 14 additions & 7 deletions .buildkite/scripts/pipelines/pull_request/pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ const uploadPipeline = (pipelineContent: string | object) => {
}

if (
// Failing: See https://github.com/elastic/kibana/issues/177084
// (await doAnyChangesMatch([/^x-pack\/plugins\/apm/, /^packages\/kbn-apm-synthtrace/])) ||
(await doAnyChangesMatch([
/^x-pack\/plugins\/observability_solution\/apm/,
/^packages\/kbn-apm-synthtrace/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));
Expand All @@ -101,7 +103,7 @@ const uploadPipeline = (pipelineContent: string | object) => {
}

if (
(await doAnyChangesMatch([/^x-pack\/plugins\/profiling/])) ||
(await doAnyChangesMatch([/^x-pack\/plugins\/observability_solution\/profiling/])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/profiling_cypress.yml'));
Expand All @@ -114,21 +116,26 @@ const uploadPipeline = (pipelineContent: string | object) => {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/fleet_cypress.yml'));
}

if (await doAnyChangesMatch([/^x-pack\/plugins\/exploratory_view/])) {
if (await doAnyChangesMatch([/^x-pack\/plugins\/observability_solution\/exploratory_view/])) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/exploratory_view_plugin.yml'));
}

if (
await doAnyChangesMatch([
/^x-pack\/plugins\/synthetics/,
/^x-pack\/plugins\/exploratory_view/,
/^x-pack\/plugins\/observability_solution\/synthetics/,
/^x-pack\/plugins\/observability_solution\/exploratory_view/,
])
) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/synthetics_plugin.yml'));
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/uptime_plugin.yml'));
}

if (await doAnyChangesMatch([/^x-pack\/plugins\/ux/, /^x-pack\/plugins\/exploratory_view/])) {
if (
await doAnyChangesMatch([
/^x-pack\/plugins\/observability_solution\/ux/,
/^x-pack\/plugins\/observability_solution\/exploratory_view/,
])
) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/ux_plugin_e2e.yml'));
}

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/apm_cypress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ echo "--- APM Cypress Tests"

cd "$XPACK_DIR"

node plugins/apm/scripts/test/e2e.js \
node plugins/observability_solution/apm/scripts/test/e2e.js \
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
$CYPRESS_ARGS
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/synthetics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ echo "--- synthetics @elastic/synthetics Tests"

cd "$XPACK_DIR"

node plugins/synthetics/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" --grep "MonitorManagement-monitor*"
node plugins/observability_solution/synthetics/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" --grep "MonitorManagement-monitor*"
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const apmMobileServiceOverview = url.format({
rangeTo,
},
});
describe('Mobile Service overview page', () => {
describe.skip('Mobile Service overview page', () => {
before(() => {
synthtrace.index(
generateMobileData({
Expand Down

0 comments on commit f327c2d

Please sign in to comment.