Fix incorrect version bump for 7.5 branch

.backportrc.json

@@ -1,5 +1,5 @@
 {
   "upstream": "elastic/kibana",
-  "branches": [{ "name": "6.7", "checked": true }, "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
+  "branches": [{ "name": "7.x", "checked": true }, "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
   "labels": ["backport"]
 }

.browserslistrc

@@ -1,3 +1,3 @@
 last 2 versions
 > 5%
-Safari 7
+Safari 7 # for PhantomJS support: https://github.com/elastic/kibana/issues/27136

.ci/jobs.yml

@@ -1,7 +1,7 @@
 JOB:
   - kibana-intake
   - x-pack-intake
-  # make sure all kibana-ciGRoups are listed in tasks/function_test_groups.js
+  - kibana-firefoxSmoke
   - kibana-ciGroup1
   - kibana-ciGroup2
   - kibana-ciGroup3
@@ -14,14 +14,21 @@ JOB:
   - kibana-ciGroup10
   - kibana-ciGroup11
   - kibana-ciGroup12
+  - kibana-visualRegression
+
   # make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh
+  - x-pack-firefoxSmoke
   - x-pack-ciGroup1
   - x-pack-ciGroup2
   - x-pack-ciGroup3
   - x-pack-ciGroup4
   - x-pack-ciGroup5
   - x-pack-ciGroup6
   - x-pack-ciGroup7
+  - x-pack-ciGroup8
+  - x-pack-ciGroup9
+  - x-pack-ciGroup10
+  - x-pack-visualRegression
 
 # `~` is yaml for `null`
-exclude: ~
+exclude: ~

.ci/packer_cache.sh

@@ -2,24 +2,58 @@
 
 set -e
 
+branch="$(git rev-parse --abbrev-ref HEAD 2> /dev/null)"
+
 # run setup script that gives us node, yarn, and bootstraps the project
 source src/dev/ci_setup/setup.sh;
 
 # download es snapshots
 node scripts/es snapshot --download-only;
+node scripts/es snapshot --license=oss --download-only;
 
 # download reporting browsers
-cd "x-pack";
-yarn gulp prepare;
-cd -;
+(cd "x-pack" && yarn gulp prepare);
+
+# cache the chromedriver archive
+chromedriverDistVersion="$(node -e "console.log(require('chromedriver').version)")"
+chromedriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.chromedriver)")"
+if [ -z "$chromedriverDistVersion" ] || [ -z "$chromedriverPkgVersion" ]; then
+  echo "UNABLE TO DETERMINE CHROMEDRIVER VERSIONS"
+  exit 1
+fi
+mkdir -p .chromedriver
+curl "https://chromedriver.storage.googleapis.com/$chromedriverDistVersion/chromedriver_linux64.zip" > .chromedriver/chromedriver.zip
+echo "$chromedriverPkgVersion" > .chromedriver/pkgVersion
+
+# cache the geckodriver archive
+geckodriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.geckodriver)")"
+if [ -z "$geckodriverPkgVersion" ]; then
+  echo "UNABLE TO DETERMINE geckodriver VERSIONS"
+  exit 1
+fi
+mkdir -p ".geckodriver"
+cp "node_modules/geckodriver/geckodriver.tar.gz" .geckodriver/geckodriver.tar.gz
+echo "$geckodriverPkgVersion" > .geckodriver/pkgVersion
 
 # archive cacheable directories
 mkdir -p "$HOME/.kibana/bootstrap_cache"
-tar -cf "$HOME/.kibana/bootstrap_cache/master.tar" \
+tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
   node_modules \
   packages/*/node_modules \
   x-pack/node_modules \
-  x-pack/plugins/*/node_modules \
-  x-pack/plugins/reporting/.chromium \
+  x-pack/legacy/plugins/*/node_modules \
+  x-pack/legacy/plugins/reporting/.chromium \
   test/plugin_functional/plugins/*/node_modules \
-  .es;
+  .es \
+  .chromedriver \
+  .geckodriver;
+
+echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
+
+if [ "$branch" == "master" ]; then
+  echo "Creating bootstrap cache for 7.x";
+
+  git clone https://github.com/elastic/kibana.git --branch 7.x --depth 1 /tmp/kibana-7.x
+  (cd /tmp/kibana-7.x && ./.ci/packer_cache.sh);
+  rm -rf /tmp/kibana-7.x;
+fi

.ci/run.sh

@@ -5,8 +5,10 @@ set -e
 # move to Kibana root
 cd "$(dirname "$0")/.."
 
+source src/dev/ci_setup/load_env_keys.sh
 source src/dev/ci_setup/extract_bootstrap_cache.sh
 source src/dev/ci_setup/setup.sh
+source src/dev/ci_setup/checkout_sibling_es.sh
 
 case "$JOB" in
 kibana-intake)
@@ -16,13 +18,25 @@ kibana-ciGroup*)
   export CI_GROUP="${JOB##kibana-ciGroup}"
   ./test/scripts/jenkins_ci_group.sh
   ;;
+kibana-visualRegression*)
+  ./test/scripts/jenkins_visual_regression.sh
+  ;;
+kibana-firefoxSmoke*)
+  ./test/scripts/jenkins_firefox_smoke.sh
+  ;;
 x-pack-intake)
   ./test/scripts/jenkins_xpack.sh
   ;;
 x-pack-ciGroup*)
   export CI_GROUP="${JOB##x-pack-ciGroup}"
   ./test/scripts/jenkins_xpack_ci_group.sh
   ;;
+x-pack-visualRegression*)
+  ./test/scripts/jenkins_xpack_visual_regression.sh
+  ;;
+x-pack-firefoxSmoke*)
+  ./test/scripts/jenkins_xpack_firefox_smoke.sh
+  ;;
 *)
   echo "JOB '$JOB' is not implemented."
   exit 1

.ci/runbld_no_junit.yml

@@ -0,0 +1,6 @@
+# This file is not picked up by anything automatically
+# It is used by being passed as an argument to runbld, when automatic processing of junit reports is not desired
+profiles:
+- ".*": # Match any job
+    tests:
+      junit-filename-pattern: "8d8bd494-d909-4e67-a052-7e8b5aaeb5e4" # A bogus path that should never exist

.eslintignore

@@ -2,35 +2,44 @@ node_modules
 bower_components
 /data
 /build
+/target
 /.es
 /plugins
 /optimize
 /built_assets
+/html_docs
 /src/fixtures/vislib/mock_data
-/src/ui/public/angular-bootstrap
-/src/ui/public/flot-charts
+/src/legacy/ui/public/angular-bootstrap
+/src/legacy/ui/public/flot-charts
 /test/fixtures/scenarios
 /src/legacy/core_plugins/console/public/webpackShims
 /src/legacy/core_plugins/console/public/tests/webpackShims
-/src/ui/public/utils/decode_geo_hash.js
+/src/legacy/ui/public/utils/decode_geo_hash.js
 /src/legacy/core_plugins/timelion/public/webpackShims/jquery.flot.*
 /src/core/lib/kbn_internal_native_observable
 /packages/*/target
 /packages/eslint-config-kibana
-/packages/eslint-plugin-kibana-custom
 /packages/kbn-es-query/src/kuery/ast/kuery.js
-/packages/kbn-es-query/src/kuery/ast/legacy_kuery.js
 /packages/kbn-pm/dist
 /packages/kbn-plugin-generator/sao_template/template
 /packages/kbn-ui-framework/dist
 /packages/kbn-ui-framework/doc_site/build
 /packages/kbn-ui-framework/generator-kui/*/templates/
-/x-pack/plugins/maps/public/vendor/**
+/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
+/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
+/x-pack/legacy/plugins/maps/public/vendor/**
 /x-pack/coverage
 /x-pack/build
-/x-pack/plugins/**/__tests__/fixtures/**
+/x-pack/legacy/plugins/**/__tests__/fixtures/**
 /packages/kbn-interpreter/src/common/lib/grammar.js
-/x-pack/plugins/canvas/canvas_plugin
-/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
+/x-pack/legacy/plugins/canvas/canvas_plugin
+/x-pack/legacy/plugins/canvas/shareable_runtime/build
+/x-pack/legacy/plugins/canvas/storybook
+/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts
+/x-pack/legacy/plugins/infra/common/graphql/types.ts
+/x-pack/legacy/plugins/infra/public/graphql/types.ts
+/x-pack/legacy/plugins/infra/server/graphql/types.ts
+/x-pack/legacy/plugins/apm/cypress/**/snapshots.js
+**/graphql/types.ts
 **/*.js.snap
 !/.eslintrc.js