Skip to content

Commit 1e43653

Browse files
michaelolo24michaelolo24
committed
Merge remote-tracking branch 'upstream/main' into cases-incremental-id
2 parents 5b92290 + 8d4b095 commit 1e43653

1,822 files changed

Lines changed: 37173 additions & 21660 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ enabled:
6565
- src/platform/test/functional/apps/dashboard_elements/input_control_vis/config.ts
6666
- src/platform/test/functional/apps/dashboard_elements/links/config.ts
6767
- src/platform/test/functional/apps/dashboard_elements/markdown/config.ts
68+
- src/platform/test/functional/apps/dashboard/background_search/config.ts
6869
- src/platform/test/functional/apps/dashboard/group1/config.ts
6970
- src/platform/test/functional/apps/dashboard/group2/config.ts
7071
- src/platform/test/functional/apps/dashboard/group3/config.ts

‎.buildkite/ftr_search_stateful_configs.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ enabled:
77
- x-pack/solutions/search/test/functional_search/config.ts
88
- x-pack/solutions/search/test/functional_search/config/config.search_playground.ts
99
- x-pack/solutions/search/test/functional_search/config/config.feature_flags.ts
10-
- x-pack/solutions/search/test/functional_search/config/config.nav_v2.ts
1110
- x-pack/solutions/search/test/api_integration/apis/search_playground/config.ts
1211
- x-pack/solutions/search/test/functional_solution_sidenav/config.ts
13-
- x-pack/solutions/search/test/functional_solution_sidenav/config.nav_v2.ts
1412
- x-pack/solutions/search/test/accessibility/config.ts
1513
- x-pack/platform/test/onechat_api_integration/configs/config.stateful.ts

‎.buildkite/pipelines/es_snapshots/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ steps:
99
localSsds: 1
1010
localSsdInterface: nvme
1111
machineType: c2-standard-8
12-
diskSizeGb: 100
12+
diskSizeGb: 130

src/platform/plugins/private/input_control_vis/public/test_utils/update_component.ts renamed to .buildkite/pipelines/flaky_tests/constants.ts

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,11 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
import type { ShallowWrapper, ReactWrapper } from 'enzyme';
10+
export enum TestSuiteType {
11+
FTR = 'ftr-suite',
12+
SCOUT = 'scout-suite',
13+
CYPRESS = 'cypress-suite',
14+
SYNTHETICS = 'synthetics-suite',
15+
}
1116

12-
export const updateComponent = async (
13-
component:
14-
| ShallowWrapper<any, Readonly<{}>, React.Component<{}, {}, any>>
15-
| ReactWrapper<any, Readonly<{}>, React.Component<{}, {}, any>>
16-
) => {
17-
// Ensure all promises resolve
18-
await new Promise((resolve) => process.nextTick(resolve));
19-
// Ensure the state changes are reflected
20-
component.update();
21-
};
17+
export const TEST_SUITE_TYPES = Object.values(TestSuiteType);

‎.buildkite/pipelines/flaky_tests/pipeline.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99

1010
import { groups } from './groups.json';
11+
import { TestSuiteType } from './constants';
1112
import type { BuildkiteStep } from '#pipeline-utils';
1213
import { expandAgentQueue, collectEnvFromLabels } from '#pipeline-utils';
1314

@@ -171,7 +172,7 @@ for (const testSuite of testSuites) {
171172
env: {
172173
FTR_CONFIG: testSuite.ftrConfig,
173174
},
174-
key: `ftr-suite-${suiteIndex++}`,
175+
key: `${TestSuiteType.FTR}-${suiteIndex++}`,
175176
label: `${testSuite.ftrConfig}`,
176177
parallelism: testSuite.count,
177178
concurrency,
@@ -198,7 +199,7 @@ for (const testSuite of testSuites) {
198199
SCOUT_CONFIG: testSuite.scoutConfig,
199200
SCOUT_CONFIG_GROUP_TYPE: scoutConfigGroupType!,
200201
},
201-
key: `scout-suite-${suiteIndex++}`,
202+
key: `${TestSuiteType.SCOUT}-${suiteIndex++}`,
202203
label: `${testSuite.scoutConfig}`,
203204
parallelism: testSuite.count,
204205
concurrency,
@@ -229,7 +230,7 @@ for (const testSuite of testSuites) {
229230
command: `.buildkite/scripts/steps/functional/${suiteName}.sh`,
230231
label: group.name,
231232
agents: expandAgentQueue(agentQueue),
232-
key: `cypress-suite-${suiteIndex++}`,
233+
key: `${TestSuiteType.CYPRESS}-${suiteIndex++}`,
233234
depends_on: 'build',
234235
timeout_in_minutes: 150,
235236
parallelism: testSuite.count,
@@ -262,7 +263,7 @@ for (const testSuite of testSuites) {
262263
command: `.buildkite/scripts/steps/functional/${suiteName}.sh`,
263264
label: synthGroup.name,
264265
agents: expandAgentQueue('n2-4-spot'),
265-
key: `synthetics-suite-${suiteIndex++}`,
266+
key: `${TestSuiteType.SYNTHETICS}-${suiteIndex++}`,
266267
depends_on: 'build',
267268
timeout_in_minutes: 30,
268269
parallelism: testSuite.count,

‎.buildkite/pipelines/flaky_tests/post_stats_on_pr.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10+
import { TEST_SUITE_TYPES } from './constants';
1011
import { BuildkiteClient, getGithubClient } from '#pipeline-utils';
1112

1213
interface TestSuiteResult {
@@ -28,7 +29,7 @@ async function main() {
2829
// Calculate success metrics
2930
const jobs = buildkiteBuild.jobs;
3031
const testSuiteRuns = jobs.filter((step) => {
31-
return step.step_key?.includes('ftr-suite') || step.step_key?.includes('cypress-suite');
32+
return TEST_SUITE_TYPES.some((testType) => step.step_key?.includes(testType));
3233
});
3334
const testSuiteGroups = groupBy('name', testSuiteRuns);
3435

‎.buildkite/pipelines/sonarqube.yml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.buildkite/scripts/common/setup_job_env.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,6 @@ EOF
122122
DEPLOY_TAGGER_SLACK_WEBHOOK_URL=${DEPLOY_TAGGER_SLACK_WEBHOOK_URL:-"$(vault_get kibana-serverless-release-tools DEPLOY_TAGGER_SLACK_WEBHOOK_URL)"}
123123
export DEPLOY_TAGGER_SLACK_WEBHOOK_URL
124124

125-
SONAR_LOGIN=$(vault_get sonarqube token)
126-
export SONAR_LOGIN
127-
128125
ELASTIC_APM_SERVER_URL=$(vault_get project-kibana-ci-apm apm_server_url)
129126
export ELASTIC_APM_SERVER_URL
130127

‎.buildkite/scripts/steps/code_coverage/jest_parallel.sh‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,7 @@ echo "--- Jest [$TEST_TYPE] configs complete"
8787
printf "%s\n" "${results[@]}"
8888

8989
# Scout reporter
90-
echo "--- Upload Scout reporter events to AppEx QA's team cluster"
91-
if [[ "${SCOUT_REPORTER_ENABLED:-}" == "true" ]]; then
92-
node scripts/scout upload-events --dontFailOnError
93-
else
94-
echo "⚠️ The SCOUT_REPORTER_ENABLED environment variable is not 'true'. Skipping event upload."
95-
fi
90+
source .buildkite/scripts/steps/test/scout_upload_report_events.sh
9691

9792
# Force exit 0 to ensure the next build step starts.
9893
exit 0

‎.buildkite/scripts/steps/es_snapshots/build.sh‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@ docker images "docker.elastic.co/elasticsearch/elasticsearch" --format "{{.Tag}}
8989
docker images "docker.elastic.co/elasticsearch/elasticsearch" --format "{{.Tag}}" | xargs -n1 bash -c 'docker save docker.elastic.co/elasticsearch/elasticsearch:${0} | gzip > ../es-build/elasticsearch-${0}-docker-image.tar.gz'
9090

9191
echo "--- Create kibana-ci docker cloud image archives"
92-
# Ignore build failures. This docker image downloads metricbeat and filebeat.
93-
# When we bump versions, these dependencies may not exist yet, but we don't want to
94-
# block the rest of the snapshot promotion process
95-
set +e
9692
./gradlew :distribution:docker:cloud-ess-docker-export:assemble && {
9793
ES_CLOUD_ID=$(docker images "docker.elastic.co/elasticsearch/elasticsearch-cloud-ess" --format "{{.ID}}")
9894
ES_CLOUD_VERSION=$(docker images "docker.elastic.co/elasticsearch/elasticsearch-cloud-ess" --format "{{.Tag}}")
@@ -106,7 +102,6 @@ set +e
106102
export ELASTICSEARCH_CLOUD_IMAGE="$KIBANA_ES_CLOUD_IMAGE"
107103
export ELASTICSEARCH_CLOUD_IMAGE_CHECKSUM="$(docker images "$KIBANA_ES_CLOUD_IMAGE" --format "{{.Digest}}")"
108104
}
109-
set -e
110105

111106
echo "--- Create checksums for snapshot files"
112107
cd "$destination"

0 commit comments

Comments
 (0)