Skip to content

Commit c69bb16

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into savedObjectsBetweenVersionsTest
2 parents 79e69d6 + 03b104c commit c69bb16

9,648 files changed

Lines changed: 588376 additions & 153746 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.

‎.bazeliskversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.7.3
1+
1.7.5

‎.bazelrc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,12 @@ build --workspace_status_command="node ./src/dev/bazel_workspace_status.js"
1616
# build --build_metadata=VISIBILITY=PUBLIC
1717
build --build_metadata=TEST_GROUPS=//packages
1818

19+
###############################
20+
# Offline Support #
21+
# Turn on these settings with #
22+
# --config=offline #
23+
###############################
24+
25+
## Reset remote cache and backend support
26+
build:offline --bes_backend="" --remote_cache=""
27+
run:offline --bes_backend="" --remote_cache=""

‎.bazelrc.common‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
# Local Cache Settings
99
## Avoid cache results from being corrupt when changing source during build
10-
common --experimental_guard_against_concurrent_changes
10+
build --experimental_guard_against_concurrent_changes
11+
run --experimental_guard_against_concurrent_changes
12+
test --experimental_guard_against_concurrent_changes
1113

1214
## Cache action outputs on disk so they persist across output_base and bazel shutdown (eg. changing branches)
1315
build --disk_cache=~/.bazel-cache/disk-cache

‎.ci/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=14.15.4
4+
ARG NODE_VERSION=14.16.0
55

66
FROM node:${NODE_VERSION} AS base
77

‎.ci/Jenkinsfile_baseline_capture‎

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,48 @@
33
library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

6-
kibanaPipeline(timeoutMinutes: 120) {
6+
kibanaPipeline(timeoutMinutes: 210) {
77
githubCommitStatus.trackBuild(params.commit, 'kibana-ci-baseline') {
88
ciStats.trackBuild {
9-
catchError {
10-
withEnv([
11-
'CI_PARALLEL_PROCESS_NUMBER=1'
12-
]) {
13-
parallel([
14-
'oss-baseline': {
15-
workers.ci(name: 'oss-baseline', size: 'l', ramDisk: true, runErrorReporter: false, bootstrapped: false) {
16-
// bootstrap ourselves, but with the env needed to upload the ts refs cache
17-
withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
18-
withEnv([
19-
'BUILD_TS_REFS_CACHE_ENABLE=true',
20-
'BUILD_TS_REFS_CACHE_CAPTURE=true'
21-
]) {
22-
kibanaPipeline.doSetup()
23-
}
24-
}
9+
catchErrors {
10+
slackNotifications.onFailure(
11+
title: "*<${env.BUILD_URL}|[${params.branch}] Baseline Capture Failure>*",
12+
message: "[${params.branch}/${params.commit}] Baseline Capture Failure",
13+
) {
14+
retryable.enable(2)
2515

26-
kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
16+
catchErrors {
17+
workers.ci(
18+
name: 'baseline-worker',
19+
size: 'xl',
20+
ramDisk: true,
21+
runErrorReporter: false,
22+
bootstrapped: false
23+
) {
24+
withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
25+
withEnv([
26+
'BUILD_TS_REFS_CACHE_ENABLE=true',
27+
'BUILD_TS_REFS_CACHE_CAPTURE=true',
28+
'DISABLE_BOOTSTRAP_VALIDATION=true',
29+
]) {
30+
kibanaPipeline.doSetup()
31+
}
2732
}
28-
},
29-
'xpack-baseline': {
30-
workers.ci(name: 'xpack-baseline', size: 'l', ramDisk: true, runErrorReporter: false) {
31-
kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh')()
33+
34+
kibanaPipeline.withCiTaskQueue([parallel: 2]) {
35+
catchErrors {
36+
tasks([
37+
kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh'),
38+
kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh'),
39+
])
40+
}
3241
}
33-
},
34-
])
42+
}
43+
}
3544
}
3645
}
37-
38-
kibanaPipeline.sendMail()
39-
slackNotifications.onFailure()
4046
}
47+
48+
kibanaPipeline.sendMail()
4149
}
4250
}

‎.ci/Jenkinsfile_security_cypress‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ kibanaPipeline(timeoutMinutes: 180) {
1717

1818
workers.ci(name: job, size: 'l', ramDisk: true) {
1919
kibanaPipeline.bash('test/scripts/jenkins_xpack_build_kibana.sh', 'Build Default Distributable')
20-
kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress.sh')()
20+
kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_chrome.sh')()
21+
// Temporarily disabled to figure out test flake
22+
// kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()
2123
}
2224
}
2325
}

‎.ci/es-snapshots/Jenkinsfile_verify_es‎

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,38 +30,22 @@ kibanaPipeline(timeoutMinutes: 210) {
3030
"ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}",
3131
'IGNORE_SHIP_CI_STATS_ERROR=true',
3232
]) {
33-
parallel([
34-
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
35-
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
36-
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
37-
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
38-
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
39-
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
40-
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
41-
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
42-
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
43-
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
44-
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
45-
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
46-
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
47-
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
48-
]),
49-
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
50-
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
51-
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
52-
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
53-
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
54-
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
55-
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
56-
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
57-
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
58-
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
59-
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
60-
'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
61-
'xpack-ciGroup12': kibanaPipeline.xpackCiGroupProcess(12),
62-
'xpack-ciGroup13': kibanaPipeline.xpackCiGroupProcess(13),
63-
]),
64-
])
33+
kibanaPipeline.withTasks {
34+
tasks([
35+
kibanaPipeline.scriptTaskDocker('Jest Integration Tests', 'test/scripts/test/jest_integration.sh'),
36+
kibanaPipeline.scriptTask('API Integration Tests', 'test/scripts/test/api_integration.sh'),
37+
])
38+
39+
task {
40+
kibanaPipeline.buildOss(6)
41+
tasks.ossCiGroups()
42+
}
43+
44+
task {
45+
kibanaPipeline.buildXpack(10)
46+
tasks.xpackCiGroups()
47+
}
48+
}
6549
}
6650

6751
promoteSnapshot(SNAPSHOT_VERSION, SNAPSHOT_ID)
@@ -72,7 +56,9 @@ kibanaPipeline(timeoutMinutes: 210) {
7256
}
7357

7458
def promoteSnapshot(snapshotVersion, snapshotId) {
75-
node(workers.label('s')) {
76-
esSnapshots.promote(snapshotVersion, snapshotId)
59+
if (buildUtils.getBuildStatus() == 'SUCCESS') {
60+
node(workers.label('s')) {
61+
esSnapshots.promote(snapshotVersion, snapshotId)
62+
}
7763
}
7864
}

‎.ci/packer_cache.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@
22

33
set -e
44

5+
# cache image used by kibana-load-testing project
6+
docker pull "maven:3.6.3-openjdk-8-slim"
7+
58
./.ci/packer_cache_for_branch.sh master
69
./.ci/packer_cache_for_branch.sh 7.x

0 commit comments

Comments
 (0)