Merge remote-tracking branch 'upstream/master' into doc/lens/popups

.ci/Jenkinsfile_flaky

@@ -5,11 +5,10 @@ kibanaLibrary.load()
 
 def CI_GROUP_PARAM = params.CI_GROUP
 
-// Looks like 'oss:ciGroup:1', 'oss:firefoxSmoke', or 'all:serverMocha'
+// Looks like 'oss:ciGroup:1', 'oss:firefoxSmoke'
 def JOB_PARTS = CI_GROUP_PARAM.split(':')
 def IS_XPACK = JOB_PARTS[0] == 'xpack'
 def JOB = JOB_PARTS[1]
-def NEED_BUILD = JOB != 'serverMocha'
 def CI_GROUP = JOB_PARTS.size() > 2 ? JOB_PARTS[2] : ''
 def EXECUTIONS = params.NUMBER_EXECUTIONS.toInteger()
 def AGENT_COUNT = getAgentCount(EXECUTIONS)
@@ -31,15 +30,13 @@ kibanaPipeline(timeoutMinutes: 180) {
         print "Agent ${agentNumberInside} - ${agentExecutions} executions"
 
         workers.functional('flaky-test-runner', {
-          if (NEED_BUILD) {
-            if (!IS_XPACK) {
-              kibanaPipeline.buildOss()
-              if (CI_GROUP == '1') {
-                runbld("./test/scripts/jenkins_build_kbn_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
-              }
-            } else {
-              kibanaPipeline.buildXpack()
+          if (!IS_XPACK) {
+            kibanaPipeline.buildOss()
+            if (CI_GROUP == '1') {
+              runbld("./test/scripts/jenkins_build_kbn_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
             }
+          } else {
+            kibanaPipeline.buildXpack()
           }
         }, getWorkerMap(agentNumberInside, agentExecutions, worker, workerFailures))()
       }
@@ -60,17 +57,7 @@ kibanaPipeline(timeoutMinutes: 180) {
 
 def getWorkerFromParams(isXpack, job, ciGroup) {
   if (!isXpack) {
-    if (job == 'serverMocha') {
-      return kibanaPipeline.functionalTestProcess('serverMocha', {
-        kibanaPipeline.bash(
-          """
-            source src/dev/ci_setup/setup_env.sh
-            node scripts/mocha
-          """,
-          "run `node scripts/mocha`"
-        )
-      })
-    } else if (job == 'accessibility') {
+    if (job == 'accessibility') {
       return kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh')
     } else if (job == 'firefoxSmoke') {
       return kibanaPipeline.functionalTestProcess('firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh')

.ci/es-snapshots/Jenkinsfile_build_es

@@ -25,90 +25,92 @@ def PROMOTE_WITHOUT_VERIFY = !!params.PROMOTE_WITHOUT_VERIFICATION
 timeout(time: 120, unit: 'MINUTES') {
   timestamps {
     ansiColor('xterm') {
-      node(workers.label('l')) {
-        catchErrors {
-          def VERSION
-          def SNAPSHOT_ID
-          def DESTINATION
-
-          def scmVars = checkoutEs(ES_BRANCH)
-          def GIT_COMMIT = scmVars.GIT_COMMIT
-          def GIT_COMMIT_SHORT = sh(script: "git rev-parse --short ${GIT_COMMIT}", returnStdout: true).trim()
-
-          buildArchives('to-archive')
-
-          dir('to-archive') {
-            def now = new Date()
-            def date = now.format("yyyyMMdd-HHmmss")
-
-            def filesRaw = sh(script: "ls -1", returnStdout: true).trim()
-            def files = filesRaw
-              .split("\n")
-              .collect { filename ->
-                // Filename examples
-                // elasticsearch-oss-8.0.0-SNAPSHOT-linux-x86_64.tar.gz
-                // elasticsearch-8.0.0-SNAPSHOT-linux-x86_64.tar.gz
-                def parts = filename.replace("elasticsearch-oss", "oss").split("-")
-
-                VERSION = VERSION ?: parts[1]
-                SNAPSHOT_ID = SNAPSHOT_ID ?: "${date}_${GIT_COMMIT_SHORT}"
-                DESTINATION = DESTINATION ?: "${VERSION}/archives/${SNAPSHOT_ID}"
-
-                return [
-                  filename: filename,
-                  checksum: filename + '.sha512',
-                  url: "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${DESTINATION}/${filename}".toString(),
-                  version: parts[1],
-                  platform: parts[3],
-                  architecture: parts[4].split('\\.')[0],
-                  license: parts[0] == 'oss' ? 'oss' : 'default',
+      slackNotifications.onFailure {
+        node(workers.label('l')) {
+          catchErrors {
+            def VERSION
+            def SNAPSHOT_ID
+            def DESTINATION
+
+            def scmVars = checkoutEs(ES_BRANCH)
+            def GIT_COMMIT = scmVars.GIT_COMMIT
+            def GIT_COMMIT_SHORT = sh(script: "git rev-parse --short ${GIT_COMMIT}", returnStdout: true).trim()
+
+            buildArchives('to-archive')
+
+            dir('to-archive') {
+              def now = new Date()
+              def date = now.format("yyyyMMdd-HHmmss")
+
+              def filesRaw = sh(script: "ls -1", returnStdout: true).trim()
+              def files = filesRaw
+                .split("\n")
+                .collect { filename ->
+                  // Filename examples
+                  // elasticsearch-oss-8.0.0-SNAPSHOT-linux-x86_64.tar.gz
+                  // elasticsearch-8.0.0-SNAPSHOT-linux-x86_64.tar.gz
+                  def parts = filename.replace("elasticsearch-oss", "oss").split("-")
+
+                  VERSION = VERSION ?: parts[1]
+                  SNAPSHOT_ID = SNAPSHOT_ID ?: "${date}_${GIT_COMMIT_SHORT}"
+                  DESTINATION = DESTINATION ?: "${VERSION}/archives/${SNAPSHOT_ID}"
+
+                  return [
+                    filename: filename,
+                    checksum: filename + '.sha512',
+                    url: "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${DESTINATION}/${filename}".toString(),
+                    version: parts[1],
+                    platform: parts[3],
+                    architecture: parts[4].split('\\.')[0],
+                    license: parts[0] == 'oss' ? 'oss' : 'default',
+                  ]
+                }
+
+              sh 'find * -exec bash -c "shasum -a 512 {} > {}.sha512" \\;'
+
+              def manifest = [
+                bucket: "kibana-ci-es-snapshots-daily/${DESTINATION}".toString(),
+                branch: ES_BRANCH,
+                sha: GIT_COMMIT,
+                sha_short: GIT_COMMIT_SHORT,
+                version: VERSION,
+                generated: now.format("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone("UTC")),
+                archives: files,
+              ]
+              def manifestJson = toJSON(manifest).toString()
+              writeFile file: 'manifest.json', text: manifestJson
+
+              upload(DESTINATION, '*.*')
+
+              sh "cp manifest.json manifest-latest.json"
+              upload(VERSION, 'manifest-latest.json')
+            }
+
+            if (PROMOTE_WITHOUT_VERIFY) {
+              esSnapshots.promote(VERSION, SNAPSHOT_ID)
+
+              emailext(
+                to: '[email protected]',
+                subject: "ES snapshot promoted without verification: ${params.ES_BRANCH}",
+                body: '${SCRIPT,template="groovy-html.template"}',
+                mimeType: 'text/html',
+              )
+            } else {
+              build(
+                propagate: false,
+                wait: false,
+                job: 'elasticsearch+snapshots+verify',
+                parameters: [
+                  string(name: 'branch_specifier', value: branch_specifier),
+                  string(name: 'SNAPSHOT_VERSION', value: VERSION),
+                  string(name: 'SNAPSHOT_ID', value: SNAPSHOT_ID),
                 ]
-              }
-
-            sh 'find * -exec bash -c "shasum -a 512 {} > {}.sha512" \\;'
-
-            def manifest = [
-              bucket: "kibana-ci-es-snapshots-daily/${DESTINATION}".toString(),
-              branch: ES_BRANCH,
-              sha: GIT_COMMIT,
-              sha_short: GIT_COMMIT_SHORT,
-              version: VERSION,
-              generated: now.format("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone("UTC")),
-              archives: files,
-            ]
-            def manifestJson = toJSON(manifest).toString()
-            writeFile file: 'manifest.json', text: manifestJson
-
-            upload(DESTINATION, '*.*')
-
-            sh "cp manifest.json manifest-latest.json"
-            upload(VERSION, 'manifest-latest.json')
+              )
+            }
           }
 
-          if (PROMOTE_WITHOUT_VERIFY) {
-            esSnapshots.promote(VERSION, SNAPSHOT_ID)
-
-            emailext(
-              to: '[email protected]',
-              subject: "ES snapshot promoted without verification: ${params.ES_BRANCH}",
-              body: '${SCRIPT,template="groovy-html.template"}',
-              mimeType: 'text/html',
-            )
-          } else {
-            build(
-              propagate: false,
-              wait: false,
-              job: 'elasticsearch+snapshots+verify',
-              parameters: [
-                string(name: 'branch_specifier', value: branch_specifier),
-                string(name: 'SNAPSHOT_VERSION', value: VERSION),
-                string(name: 'SNAPSHOT_ID', value: SNAPSHOT_ID),
-              ]
-            )
-          }
+          kibanaPipeline.sendMail()
         }
-
-        kibanaPipeline.sendMail()
       }
     }
   }

.ci/teamcity/checks/sasslint.sh → .ci/teamcity/checks/stylelint.sh

@@ -4,5 +4,5 @@ set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
-checks-reporter-with-killswitch "Lint: sasslint" \
-  node scripts/sasslint
+checks-reporter-with-killswitch "Lint: stylelint" \
+  node scripts/stylelint

.ci/teamcity/setup_ci_stats.js

@@ -24,7 +24,7 @@ const ciStats = require('./ci_stats');
       branch: process.env.GIT_BRANCH.replace(/^(refs\/heads\/|origin\/)/, ''),
       commit: process.env.GIT_COMMIT,
       targetBranch: process.env.GITHUB_PR_TARGET_BRANCH || null,
-      mergeBase: null, // TODO
+      mergeBase: process.env.GITHUB_PR_MERGE_BASE || null,
     });
   } catch (ex) {
     console.error(ex);

.ci/teamcity/setup_env.sh

@@ -33,15 +33,17 @@ fi
 
 if is_pr; then
   tc_set_env ELASTIC_APM_ACTIVE false
-  tc_set_env CHECKS_REPORTER_ACTIVE true
+  tc_set_env CHECKS_REPORTER_ACTIVE "${CI_REPORTING_ENABLED-}"
 
   # These can be removed once we're not supporting Jenkins and TeamCity at the same time
   # These are primarily used by github checks reporter and can be configured via /github_checks_api.json
   tc_set_env ghprbGhRepository "elastic/kibana" # TODO?
   tc_set_env ghprbActualCommit "$GITHUB_PR_TRIGGERED_SHA"
   tc_set_env BUILD_URL "$TEAMCITY_BUILD_URL"
+
+  set_git_merge_base
 else
-  tc_set_env ELASTIC_APM_ACTIVE true
+  tc_set_env ELASTIC_APM_ACTIVE "${CI_REPORTING_ENABLED-}"
   tc_set_env CHECKS_REPORTER_ACTIVE false
 fi
 

.ci/teamcity/util.sh

@@ -79,3 +79,10 @@ tc_retry() {
   }
   tc_end_block "Retryable Step - Attempt #1"
 }
+
+set_git_merge_base() {
+  if [[ "${GITHUB_PR_TARGET_BRANCH-}" ]]; then
+    git fetch origin "$GITHUB_PR_TARGET_BRANCH"
+    tc_set_env GITHUB_PR_MERGE_BASE "$(git merge-base HEAD FETCH_HEAD)"
+  fi
+}