Skip to content

Commit 66ea7d9

Browse files
author
Maja Grubic
committed
Merge master
2 parents 269b636 + e6e7187 commit 66ea7d9

904 files changed

Lines changed: 36242 additions & 32308 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: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,31 @@ pipeline {
3737
deleteDir()
3838
gitCheckout(basedir: "${BASE_DIR}", githubNotifyFirstTimeContributor: false,
3939
shallow: false, reference: "/var/lib/jenkins/.git-references/kibana.git")
40+
41+
// Filter when to run based on the below reasons:
42+
// - On a PRs when:
43+
// - There are changes related to the APM UI project
44+
// - only when the owners of those changes are members of the given GitHub teams
45+
// - On merges to branches when:
46+
// - There are changes related to the APM UI project
47+
// - FORCE parameter is set to true.
4048
script {
49+
def apm_updated = false
4150
dir("${BASE_DIR}"){
42-
def regexps =[ "^x-pack/plugins/apm/.*" ]
43-
env.APM_UPDATED = isGitRegionMatch(patterns: regexps)
51+
apm_updated = isGitRegionMatch(patterns: [ "^x-pack/plugins/apm/.*" ])
52+
}
53+
if (isPR()) {
54+
def isMember = isMemberOf(user: env.CHANGE_AUTHOR, team: ['apm-ui', 'uptime'])
55+
setEnvVar('RUN_APM_E2E', params.FORCE || (apm_updated && isMember))
56+
} else {
57+
setEnvVar('RUN_APM_E2E', params.FORCE || apm_updated)
4458
}
4559
}
4660
}
4761
}
4862
stage('Prepare Kibana') {
4963
options { skipDefaultCheckout() }
50-
when {
51-
anyOf {
52-
expression { return params.FORCE }
53-
expression { return env.APM_UPDATED != "false" }
54-
}
55-
}
64+
when { expression { return env.RUN_APM_E2E != "false" } }
5665
environment {
5766
JENKINS_NODE_COOKIE = 'dontKillMe'
5867
}
@@ -70,12 +79,7 @@ pipeline {
7079
}
7180
stage('Smoke Tests'){
7281
options { skipDefaultCheckout() }
73-
when {
74-
anyOf {
75-
expression { return params.FORCE }
76-
expression { return env.APM_UPDATED != "false" }
77-
}
78-
}
82+
when { expression { return env.RUN_APM_E2E != "false" } }
7983
steps{
8084
notifyTestStatus('Running smoke tests', 'PENDING')
8185
dir("${BASE_DIR}"){

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
8686
/src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-core-ui
8787
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
88+
/x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
8889

8990
# Observability UIs
9091
/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
@@ -169,6 +170,7 @@
169170
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
170171
/x-pack/plugins/security/ @elastic/kibana-security
171172
/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
173+
/x-pack/test/ui_capabilities/ @elastic/kibana-security
172174
/x-pack/test/encrypted_saved_objects_api_integration/ @elastic/kibana-security
173175
/x-pack/test/functional/apps/security/ @elastic/kibana-security
174176
/x-pack/test/kerberos_api_integration/ @elastic/kibana-security

‎.github/ISSUE_TEMPLATE/APM.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: APM Issue
33
about: Issues related to the APM solution in Kibana
44
labels: Team:apm
5-
title: [APM]
5+
title: "[APM]"
66
---
77

88
**Versions**

0 commit comments

Comments
 (0)