Skip to content

Commit 8567dbf

Browse files
ycterceroyctercero
committed
Merge branch 'master' of github.com:yctercero/kibana into builder_nested_logic
2 parents 4fcab84 + 6a77bec commit 8567dbf

File tree

234 files changed

+2724
-853
lines changed

Some content is hidden

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

234 files changed

+2724
-853
lines changed

‎.ci/Dockerfile‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
2+
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
3+
4+
ARG NODE_VERSION=10.21.0
5+
6+
FROM node:${NODE_VERSION} AS base
7+
8+
RUN apt-get update && \
9+
apt-get -y install xvfb gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 \
10+
libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 \
11+
libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 \
12+
libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 \
13+
libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget openjdk-8-jre && \
14+
rm -rf /var/lib/apt/lists/*
15+
16+
RUN curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
17+
&& sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
18+
&& apt-get update \
19+
&& apt-get install -y rsync jq bsdtar google-chrome-stable \
20+
--no-install-recommends \
21+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
22+
23+
RUN LATEST_VAULT_RELEASE=$(curl -s https://api.github.com/repos/hashicorp/vault/tags | jq --raw-output .[0].name[1:]) \
24+
&& curl -L https://releases.hashicorp.com/vault/${LATEST_VAULT_RELEASE}/vault_${LATEST_VAULT_RELEASE}_linux_amd64.zip -o vault.zip \
25+
&& unzip vault.zip \
26+
&& rm vault.zip \
27+
&& chmod +x vault \
28+
&& mv vault /usr/local/bin/vault
29+
30+
RUN groupadd -r kibana && useradd -r -g kibana kibana && mkdir /home/kibana && chown kibana:kibana /home/kibana
31+
32+
COPY ./bash_standard_lib.sh /usr/local/bin/bash_standard_lib.sh
33+
RUN chmod +x /usr/local/bin/bash_standard_lib.sh
34+
35+
COPY ./runbld /usr/local/bin/runbld
36+
RUN chmod +x /usr/local/bin/runbld
37+
38+
USER kibana

‎.ci/Jenkinsfile_baseline_capture‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,22 @@ kibanaPipeline(timeoutMinutes: 120) {
77
githubCommitStatus.trackBuild(params.commit, 'kibana-ci-baseline') {
88
ciStats.trackBuild {
99
catchError {
10-
parallel([
11-
'oss-visualRegression': {
12-
workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
13-
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
14-
}
15-
},
16-
'xpack-visualRegression': {
17-
workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
18-
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
19-
}
20-
},
21-
])
10+
withEnv([
11+
'CI_PARALLEL_PROCESS_NUMBER=1'
12+
]) {
13+
parallel([
14+
'oss-visualRegression': {
15+
workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
16+
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')()
17+
}
18+
},
19+
'xpack-visualRegression': {
20+
workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
21+
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')()
22+
}
23+
},
24+
])
25+
}
2226
}
2327

2428
kibanaPipeline.sendMail()

‎.ci/runbld_no_junit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
profiles:
44
- ".*": # Match any job
55
tests:
6-
junit-filename-pattern: "8d8bd494-d909-4e67-a052-7e8b5aaeb5e4" # A bogus path that should never exist
6+
junit-filename-pattern: false

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ npm-debug.log*
4949
.tern-project
5050
.nyc_output
5151
.ci/pipeline-library/build/
52+
.ci/runbld
53+
.ci/bash_standard_lib.sh
5254
.gradle
5355

5456
# apm plugin

‎Jenkinsfile‎

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,7 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true)
99
ciStats.trackBuild {
1010
catchError {
1111
retryable.enable()
12-
parallel([
13-
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
14-
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
15-
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
16-
'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
17-
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
18-
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
19-
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
20-
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
21-
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
22-
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
23-
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
24-
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
25-
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
26-
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
27-
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
28-
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
29-
'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
30-
// 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
31-
]),
32-
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
33-
'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
34-
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
35-
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
36-
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
37-
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
38-
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
39-
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
40-
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
41-
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
42-
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
43-
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
44-
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
45-
'xpack-savedObjectsFieldMetrics': kibanaPipeline.functionalTestProcess('xpack-savedObjectsFieldMetrics', './test/scripts/jenkins_xpack_saved_objects_field_metrics.sh'),
46-
'xpack-securitySolutionCypress': { processNumber ->
47-
whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/', 'x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/', 'x-pack/plugins/triggers_actions_ui/public/application/context/actions_connectors_context.tsx']) {
48-
kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)
49-
}
50-
},
51-
52-
// 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
53-
]),
54-
])
12+
kibanaPipeline.allCiTasks()
5513
}
5614
}
5715
}

‎packages/kbn-dev-utils/src/run/help.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const barCommand: Command<any> = {
5757
usage: 'bar [...names]',
5858
};
5959

60-
describe('getHelp()', () => {
60+
describe.skip('getHelp()', () => {
6161
it('returns the expected output', () => {
6262
expect(
6363
getHelp({
@@ -95,7 +95,7 @@ describe('getHelp()', () => {
9595
});
9696
});
9797

98-
describe('getCommandLevelHelp()', () => {
98+
describe.skip('getCommandLevelHelp()', () => {
9999
it('returns the expected output', () => {
100100
expect(
101101
getCommandLevelHelp({
@@ -141,7 +141,7 @@ describe('getCommandLevelHelp()', () => {
141141
});
142142
});
143143

144-
describe('getHelpForAllCommands()', () => {
144+
describe.skip('getHelpForAllCommands()', () => {
145145
it('returns the expected output', () => {
146146
expect(
147147
getHelpForAllCommands({

‎packages/kbn-dev-utils/src/serializers/absolute_path_serializer.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@
1919

2020
import { REPO_ROOT } from '../repo_root';
2121

22-
export function createAbsolutePathSerializer(rootPath: string = REPO_ROOT) {
22+
export function createAbsolutePathSerializer(
23+
rootPath: string = REPO_ROOT,
24+
replacement = '<absolute path>'
25+
) {
2326
return {
2427
test: (value: any) => typeof value === 'string' && value.startsWith(rootPath),
25-
serialize: (value: string) => value.replace(rootPath, '<absolute path>').replace(/\\/g, '/'),
28+
serialize: (value: string) => value.replace(rootPath, replacement).replace(/\\/g, '/'),
2629
};
2730
}

‎packages/kbn-optimizer/package.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@
1515
"@kbn/dev-utils": "1.0.0",
1616
"@kbn/ui-shared-deps": "1.0.0",
1717
"@types/compression-webpack-plugin": "^2.0.2",
18-
"@types/estree": "^0.0.44",
1918
"@types/loader-utils": "^1.1.3",
2019
"@types/watchpack": "^1.1.5",
2120
"@types/webpack": "^4.41.3",
22-
"acorn": "^7.1.1",
23-
"acorn-walk": "^7.1.1",
2421
"autoprefixer": "^9.7.4",
2522
"babel-loader": "^8.0.6",
2623
"clean-webpack-plugin": "^3.0.0",

‎packages/kbn-optimizer/src/common/bundle_cache.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,18 @@ export class BundleCache {
104104
public getOptimizerCacheKey() {
105105
return this.get().optimizerCacheKey;
106106
}
107+
108+
public clear() {
109+
this.state = undefined;
110+
111+
if (this.path) {
112+
try {
113+
Fs.unlinkSync(this.path);
114+
} catch (error) {
115+
if (error.code !== 'ENOENT') {
116+
throw error;
117+
}
118+
}
119+
}
120+
}
107121
}

‎packages/kbn-optimizer/src/optimizer/get_plugin_bundles.test.ts‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ import { createAbsolutePathSerializer } from '@kbn/dev-utils';
2121

2222
import { getPluginBundles } from './get_plugin_bundles';
2323

24-
expect.addSnapshotSerializer(createAbsolutePathSerializer('/repo'));
24+
expect.addSnapshotSerializer(createAbsolutePathSerializer('/repo', '<repoRoot>'));
25+
expect.addSnapshotSerializer(createAbsolutePathSerializer('/output', '<outputRoot>'));
26+
expect.addSnapshotSerializer(createAbsolutePathSerializer('/outside/of/repo', '<outsideOfRepo>'));
2527

2628
it('returns a bundle for core and each plugin', () => {
2729
expect(
@@ -56,46 +58,47 @@ it('returns a bundle for core and each plugin', () => {
5658
manifestPath: '/repo/x-pack/plugins/box/kibana.json',
5759
},
5860
],
59-
'/repo'
61+
'/repo',
62+
'/output'
6063
).map((b) => b.toSpec())
6164
).toMatchInlineSnapshot(`
6265
Array [
6366
Object {
6467
"banner": undefined,
65-
"contextDir": <absolute path>/plugins/foo,
68+
"contextDir": <repoRoot>/plugins/foo,
6669
"id": "foo",
67-
"manifestPath": <absolute path>/plugins/foo/kibana.json,
68-
"outputDir": <absolute path>/plugins/foo/target/public,
70+
"manifestPath": <repoRoot>/plugins/foo/kibana.json,
71+
"outputDir": <outputRoot>/plugins/foo/target/public,
6972
"publicDirNames": Array [
7073
"public",
7174
],
72-
"sourceRoot": <absolute path>,
75+
"sourceRoot": <repoRoot>,
7376
"type": "plugin",
7477
},
7578
Object {
7679
"banner": undefined,
77-
"contextDir": "/outside/of/repo/plugins/baz",
80+
"contextDir": <outsideOfRepo>/plugins/baz,
7881
"id": "baz",
79-
"manifestPath": "/outside/of/repo/plugins/baz/kibana.json",
80-
"outputDir": "/outside/of/repo/plugins/baz/target/public",
82+
"manifestPath": <outsideOfRepo>/plugins/baz/kibana.json,
83+
"outputDir": <outsideOfRepo>/plugins/baz/target/public,
8184
"publicDirNames": Array [
8285
"public",
8386
],
84-
"sourceRoot": <absolute path>,
87+
"sourceRoot": <repoRoot>,
8588
"type": "plugin",
8689
},
8790
Object {
8891
"banner": "/*! Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one or more contributor license agreements.
8992
* Licensed under the Elastic License; you may not use this file except in compliance with the Elastic License. */
9093
",
91-
"contextDir": <absolute path>/x-pack/plugins/box,
94+
"contextDir": <repoRoot>/x-pack/plugins/box,
9295
"id": "box",
93-
"manifestPath": <absolute path>/x-pack/plugins/box/kibana.json,
94-
"outputDir": <absolute path>/x-pack/plugins/box/target/public,
96+
"manifestPath": <repoRoot>/x-pack/plugins/box/kibana.json,
97+
"outputDir": <outputRoot>/x-pack/plugins/box/target/public,
9598
"publicDirNames": Array [
9699
"public",
97100
],
98-
"sourceRoot": <absolute path>,
101+
"sourceRoot": <repoRoot>,
99102
"type": "plugin",
100103
},
101104
]

0 commit comments

Comments
 (0)