Skip to content

Commit 1503c60

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into unskip-flaky-tests
2 parents 8feac8c + 8bc3fa4 commit 1503c60

589 files changed

Lines changed: 8055 additions & 8231 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.

‎.ci/end2end.groovy‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pipeline {
2525
durabilityHint('PERFORMANCE_OPTIMIZED')
2626
}
2727
triggers {
28-
issueCommentTrigger('(?i).*jenkins\\W+run\\W+(?:the\\W+)?e2e(?:\\W+please)?.*')
28+
issueCommentTrigger('(?i)(retest|.*jenkins\\W+run\\W+(?:the\\W+)?e2e?.*)')
2929
}
3030
parameters {
3131
booleanParam(name: 'FORCE', defaultValue: false, description: 'Whether to force the run.')
@@ -60,8 +60,14 @@ pipeline {
6060
}
6161
}
6262
steps {
63+
notifyStatus('Starting services', 'PENDING')
6364
dir("${APM_ITS}"){
64-
sh './scripts/compose.py start master --no-kibana --no-xpack-secure'
65+
sh './scripts/compose.py start master --no-kibana'
66+
}
67+
}
68+
post {
69+
unsuccessful {
70+
notifyStatus('Environmental issue', 'FAILURE')
6571
}
6672
}
6773
}
@@ -77,10 +83,16 @@ pipeline {
7783
JENKINS_NODE_COOKIE = 'dontKillMe'
7884
}
7985
steps {
86+
notifyStatus('Preparing kibana', 'PENDING')
8087
dir("${BASE_DIR}"){
8188
sh script: "${CYPRESS_DIR}/ci/prepare-kibana.sh"
8289
}
8390
}
91+
post {
92+
unsuccessful {
93+
notifyStatus('Kibana warm up failed', 'FAILURE')
94+
}
95+
}
8496
}
8597
stage('Smoke Tests'){
8698
options { skipDefaultCheckout() }
@@ -91,6 +103,7 @@ pipeline {
91103
}
92104
}
93105
steps{
106+
notifyStatus('Running smoke tests', 'PENDING')
94107
dir("${BASE_DIR}"){
95108
sh '''
96109
jobs -l
@@ -112,6 +125,12 @@ pipeline {
112125
archiveArtifacts(allowEmptyArchive: false, artifacts: 'apm-its.log')
113126
}
114127
}
128+
unsuccessful {
129+
notifyStatus('Test failures', 'FAILURE')
130+
}
131+
success {
132+
notifyStatus('Tests passed', 'SUCCESS')
133+
}
115134
}
116135
}
117136
}
@@ -123,3 +142,7 @@ pipeline {
123142
}
124143
}
125144
}
145+
146+
def notifyStatus(String description, String status) {
147+
withGithubNotify.notify('end2end-for-apm-ui', description, status, getBlueoceanDisplayURL())
148+
}

‎examples/ui_action_examples/public/hello_world_trigger.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818
*/
1919

2020
import { Trigger } from '../../../src/plugins/ui_actions/public';
21-
import { HELLO_WORLD_ACTION_TYPE } from './hello_world_action';
2221

2322
export const HELLO_WORLD_TRIGGER_ID = 'HELLO_WORLD_TRIGGER_ID';
2423

2524
export const helloWorldTrigger: Trigger = {
2625
id: HELLO_WORLD_TRIGGER_ID,
27-
actionIds: [HELLO_WORLD_ACTION_TYPE],
2826
};

‎examples/ui_action_examples/public/plugin.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import { Plugin, CoreSetup, CoreStart } from '../../../src/core/public';
2121
import { UiActionsSetup, UiActionsStart } from '../../../src/plugins/ui_actions/public';
22-
import { createHelloWorldAction } from './hello_world_action';
22+
import { createHelloWorldAction, HELLO_WORLD_ACTION_TYPE } from './hello_world_action';
2323
import { helloWorldTrigger } from './hello_world_trigger';
2424

2525
interface UiActionExamplesSetupDependencies {
@@ -33,8 +33,9 @@ interface UiActionExamplesStartDependencies {
3333
export class UiActionExamplesPlugin
3434
implements
3535
Plugin<void, void, UiActionExamplesSetupDependencies, UiActionExamplesStartDependencies> {
36-
public setup(core: CoreSetup, deps: UiActionExamplesSetupDependencies) {
37-
deps.uiActions.registerTrigger(helloWorldTrigger);
36+
public setup(core: CoreSetup, { uiActions }: UiActionExamplesSetupDependencies) {
37+
uiActions.registerTrigger(helloWorldTrigger);
38+
uiActions.attachAction(helloWorldTrigger.id, HELLO_WORLD_ACTION_TYPE);
3839
}
3940

4041
public start(coreStart: CoreStart, deps: UiActionExamplesStartDependencies) {

‎examples/ui_actions_explorer/public/plugin.tsx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,12 @@ export class UiActionsExplorerPlugin implements Plugin<void, void, {}, StartDeps
5656
public setup(core: CoreSetup<{ uiActions: UiActionsStart }>, deps: SetupDeps) {
5757
deps.uiActions.registerTrigger({
5858
id: COUNTRY_TRIGGER,
59-
actionIds: [],
6059
});
6160
deps.uiActions.registerTrigger({
6261
id: PHONE_TRIGGER,
63-
actionIds: [],
6462
});
6563
deps.uiActions.registerTrigger({
6664
id: USER_TRIGGER,
67-
actionIds: [],
6865
});
6966
deps.uiActions.registerAction(lookUpWeatherAction);
7067
deps.uiActions.registerAction(viewInMapsAction);

‎package.json‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,14 @@
8080
},
8181
"resolutions": {
8282
"**/@types/node": "10.12.27",
83-
"**/@types/react": "^16.9.13",
83+
"**/@types/react": "^16.9.19",
8484
"**/@types/react-router": "^5.1.3",
8585
"**/@types/hapi": "^17.0.18",
8686
"**/@types/angular": "^1.6.56",
87+
"**/@types/hoist-non-react-statics": "^3.3.1",
8788
"**/typescript": "3.7.2",
8889
"**/graphql-toolkit/lodash": "^4.17.13",
90+
"**/hoist-non-react-statics": "^3.3.2",
8991
"**/isomorphic-git/**/base64-js": "^1.2.1",
9092
"**/image-diff/gm/debug": "^2.6.9",
9193
"**/react-dom": "^16.12.0",
@@ -234,19 +236,19 @@
234236
"react-input-range": "^1.3.0",
235237
"react-markdown": "^3.4.1",
236238
"react-monaco-editor": "~0.27.0",
237-
"react-redux": "^5.1.2",
239+
"react-redux": "^7.1.3",
238240
"react-resize-detector": "^4.2.0",
239241
"react-router-dom": "^5.1.2",
240242
"react-sizeme": "^2.3.6",
241243
"react-use": "^13.13.0",
242244
"reactcss": "1.2.3",
243-
"redux": "4.0.0",
244-
"redux-actions": "2.6.5",
245-
"redux-thunk": "2.3.0",
245+
"redux": "^4.0.5",
246+
"redux-actions": "^2.6.5",
247+
"redux-thunk": "^2.3.0",
246248
"regenerator-runtime": "^0.13.3",
247249
"regression": "2.0.1",
248250
"request": "^2.88.0",
249-
"reselect": "^3.0.1",
251+
"reselect": "^4.0.0",
250252
"resize-observer-polyfill": "^1.5.0",
251253
"rison-node": "1.0.2",
252254
"rxjs": "^6.5.3",
@@ -318,7 +320,7 @@
318320
"@types/deep-freeze-strict": "^1.1.0",
319321
"@types/delete-empty": "^2.0.0",
320322
"@types/elasticsearch": "^5.0.33",
321-
"@types/enzyme": "^3.9.0",
323+
"@types/enzyme": "^3.10.5",
322324
"@types/eslint": "^6.1.3",
323325
"@types/fetch-mock": "^7.3.1",
324326
"@types/flot": "^0.0.31",
@@ -356,16 +358,15 @@
356358
"@types/podium": "^1.0.0",
357359
"@types/prop-types": "^15.5.3",
358360
"@types/reach__router": "^1.2.6",
359-
"@types/react": "^16.9.11",
360-
"@types/react-dom": "^16.9.4",
361+
"@types/react": "^16.9.19",
362+
"@types/react-dom": "^16.9.5",
361363
"@types/react-grid-layout": "^0.16.7",
362-
"@types/react-redux": "^6.0.6",
364+
"@types/react-redux": "^7.1.7",
363365
"@types/react-resize-detector": "^4.0.1",
364366
"@types/react-router": "^5.1.3",
365367
"@types/react-router-dom": "^5.1.3",
366368
"@types/react-virtualized": "^9.18.7",
367369
"@types/recompose": "^0.30.6",
368-
"@types/redux": "^3.6.31",
369370
"@types/redux-actions": "^2.6.1",
370371
"@types/request": "^2.48.2",
371372
"@types/selenium-webdriver": "^4.0.5",
@@ -398,10 +399,10 @@
398399
"classnames": "2.2.6",
399400
"dedent": "^0.7.0",
400401
"delete-empty": "^2.0.0",
401-
"enzyme": "^3.10.0",
402-
"enzyme-adapter-react-16": "^1.15.1",
403-
"enzyme-adapter-utils": "^1.12.1",
404-
"enzyme-to-json": "^3.4.3",
402+
"enzyme": "^3.11.0",
403+
"enzyme-adapter-react-16": "^1.15.2",
404+
"enzyme-adapter-utils": "^1.13.0",
405+
"enzyme-to-json": "^3.4.4",
405406
"eslint": "^6.8.0",
406407
"eslint-config-prettier": "^6.9.0",
407408
"eslint-plugin-babel": "^5.3.0",

0 commit comments

Comments
 (0)