Skip to content

Commit 437962b

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into ilm/update-condition-for-hiding-recommded-allocation
2 parents 7746647 + 6dc2734 commit 437962b

File tree

739 files changed

+16068
-5623
lines changed

Some content is hidden

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

739 files changed

+16068
-5623
lines changed

‎.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_security_cypress‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ kibanaPipeline(timeoutMinutes: 180) {
1818
workers.ci(name: job, size: 'l', ramDisk: true) {
1919
kibanaPipeline.bash('test/scripts/jenkins_xpack_build_kibana.sh', 'Build Default Distributable')
2020
kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_chrome.sh')()
21-
kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()
21+
// Temporarily disabled to figure out test flake
22+
// kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()
2223
}
2324
}
2425
}

‎.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
}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.aws-config.json
22
.signing-config.json
3+
/api_docs
34
.ackrc
45
/.es
56
/.chromium

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.15.4
1+
14.16.0

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.15.4
1+
14.16.0

0 commit comments

Comments
 (0)