Merge branch 'master' into chore/management-consistency

elastic · Feb 25, 2021 · f1a1cd5 · f1a1cd5
2 parents a7288f6 + ad19f82
commit f1a1cd5
Show file tree

Hide file tree

Showing 769 changed files with 18,287 additions and 8,991 deletions.
diff --git a/.ci/Dockerfile b/.ci/Dockerfile
@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=14.15.4
+ARG NODE_VERSION=14.16.0
 
 FROM node:${NODE_VERSION} AS base
 

diff --git a/.ci/Jenkinsfile_security_cypress b/.ci/Jenkinsfile_security_cypress
@@ -18,7 +18,8 @@ kibanaPipeline(timeoutMinutes: 180) {
         workers.ci(name: job, size: 'l', ramDisk: true) {
           kibanaPipeline.bash('test/scripts/jenkins_xpack_build_kibana.sh', 'Build Default Distributable')
           kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_chrome.sh')()
-          kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()
+          // Temporarily disabled to figure out test flake
+          // kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()
         }
       }
     }

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .aws-config.json
 .signing-config.json
+/api_docs
 .ackrc
 /.es
 /.chromium

diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-14.15.4
+14.16.0
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14.15.4
+14.16.0