Merge branch '7.x' into ua/chec_for_ml_upgrade_mode

.buildkite/pipelines/es_snapshots/verify.yml

@@ -29,6 +29,7 @@ steps:
     agents:
       queue: ci-group-6
     depends_on: build
+    timeout_in_minutes: 150
     key: default-cigroup
     retry:
       automatic:
@@ -40,6 +41,7 @@ steps:
     agents:
       queue: ci-group-6
     depends_on: build
+    timeout_in_minutes: 120
     key: default-cigroup-docker
     retry:
       automatic:
@@ -52,6 +54,7 @@ steps:
     agents:
       queue: ci-group-4d
     depends_on: build
+    timeout_in_minutes: 120
     key: oss-cigroup
     retry:
       automatic:
@@ -61,7 +64,8 @@ steps:
   - command: .buildkite/scripts/steps/test/jest_integration.sh
     label: 'Jest Integration Tests'
     agents:
-      queue: jest
+      queue: n2-4
+    timeout_in_minutes: 120
     key: jest-integration
     retry:
       automatic:
@@ -72,6 +76,7 @@ steps:
     label: 'API Integration Tests'
     agents:
       queue: jest
+    timeout_in_minutes: 120
     key: api-integration
 
   - command: .buildkite/scripts/steps/es_snapshots/trigger_promote.sh

.buildkite/pipelines/hourly.yml

@@ -1,3 +1,5 @@
+env:
+  REPORT_FAILED_TESTS_TO_GITHUB: 'true'
 steps:
   - command: .buildkite/scripts/lifecycle/pre_build.sh
     label: Pre-Build
@@ -17,7 +19,7 @@ steps:
     agents:
       queue: ci-group-6
     depends_on: build
-    timeout_in_minutes: 120
+    timeout_in_minutes: 150
     key: default-cigroup
     retry:
       automatic:
@@ -118,14 +120,14 @@ steps:
   - command: .buildkite/scripts/steps/test/jest_integration.sh
     label: 'Jest Integration Tests'
     agents:
-      queue: jest
+      queue: n2-4
     timeout_in_minutes: 120
     key: jest-integration
 
   - command: .buildkite/scripts/steps/test/api_integration.sh
     label: 'API Integration Tests'
     agents:
-      queue: jest
+      queue: n2-2
     timeout_in_minutes: 120
     key: api-integration
 

.buildkite/scripts/lifecycle/post_command.sh

@@ -22,6 +22,5 @@ if [[ "$IS_TEST_EXECUTION_STEP" == "true" ]]; then
   buildkite-agent artifact upload 'x-pack/test/functional/failure_debug/html/*.html'
   buildkite-agent artifact upload '.es/**/*.hprof'
 
-  # TODO - re-enable when Jenkins is disabled
-  # node scripts/report_failed_tests --build-url="${BUILDKITE_BUILD_URL}#${BUILDKITE_JOB_ID}" 'target/junit/**/*.xml'
+  node scripts/report_failed_tests --build-url="${BUILDKITE_BUILD_URL}#${BUILDKITE_JOB_ID}" 'target/junit/**/*.xml'
 fi

.buildkite/scripts/steps/storybooks/build_and_upload.js

@@ -6,13 +6,21 @@ const path = require('path');
 const STORYBOOKS = [
   'apm',
   'canvas',
+  'codeeditor',
   'ci_composite',
   'url_template_editor',
-  'codeeditor',
   'dashboard',
   'dashboard_enhanced',
   'data_enhanced',
   'embeddable',
+  'expression_error',
+  'expression_image',
+  'expression_metric',
+  'expression_repeat_image',
+  'expression_reveal_image',
+  'expression_shape',
+  'expression_tagcloud',
+  'fleet',
   'infra',
   'security_solution',
   'ui_actions_enhanced',

.buildkite/scripts/steps/test/jest_integration.sh

@@ -10,4 +10,4 @@ is_test_execution_step
 
 echo '--- Jest Integration Tests'
 checks-reporter-with-killswitch "Jest Integration Tests" \
-  node scripts/jest_integration --ci --verbose
+  node --max-old-space-size=5120 scripts/jest_integration --ci

.eslintrc.js

@@ -1506,7 +1506,7 @@ module.exports = {
      * TSVB overrides
      */
     {
-      files: ['src/plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}'],
+      files: ['src/plugins/vis_types/timeseries/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'import/no-default-export': 'error',
       },

.i18nrc.json

@@ -65,7 +65,7 @@
     "visTypeMetric": "src/plugins/vis_types/metric",
     "visTypeTable": "src/plugins/vis_types/table",
     "visTypeTagCloud": "src/plugins/vis_types/tagcloud",
-    "visTypeTimeseries": "src/plugins/vis_type_timeseries",
+    "visTypeTimeseries": "src/plugins/vis_types/timeseries",
     "visTypeVega": "src/plugins/vis_types/vega",
     "visTypeVislib": "src/plugins/vis_types/vislib",
     "visTypeXy": "src/plugins/vis_types/xy",

Jenkinsfile

@@ -1,5 +1,10 @@
 #!/bin/groovy
 
+if (!env.ghprbPullId) {
+  print "Non-PR builds are now in Buildkite."
+  return
+}
+
 library 'kibana-pipeline-library'
 kibanaLibrary.load()