Revert "Revert elastic#64011 and subsequent fixes (elastic#71137)"

This reverts commit b6a06df.

.ci/Dockerfile

@@ -0,0 +1,35 @@
+ARG NODE_VERSION=10.21.0
+
+FROM node:${NODE_VERSION} AS base
+
+RUN apt-get update && \
+    apt-get -y install xvfb gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 \
+      libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 \
+      libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 \
+      libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 \
+      libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget openjdk-8-jre && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
+  && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
+  && apt-get update \
+  && apt-get install -y rsync jq bsdtar google-chrome-stable \
+  --no-install-recommends \
+  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN LATEST_VAULT_RELEASE=$(curl -s https://api.github.com/repos/hashicorp/vault/tags | jq --raw-output .[0].name[1:]) \
+  && curl -L https://releases.hashicorp.com/vault/${LATEST_VAULT_RELEASE}/vault_${LATEST_VAULT_RELEASE}_linux_amd64.zip -o vault.zip \
+  && unzip vault.zip \
+  && rm vault.zip \
+  && chmod +x vault \
+  && mv vault /usr/local/bin/vault
+
+RUN groupadd -r kibana && useradd -r -g kibana kibana && mkdir /home/kibana && chown kibana:kibana /home/kibana
+
+COPY ./bash_standard_lib.sh /usr/local/bin/bash_standard_lib.sh
+RUN chmod +x /usr/local/bin/bash_standard_lib.sh
+
+COPY ./runbld /usr/local/bin/runbld
+RUN chmod +x /usr/local/bin/runbld
+
+USER kibana

.ci/runbld_no_junit.yml

@@ -3,4 +3,4 @@
 profiles:
 - ".*": # Match any job
     tests:
-      junit-filename-pattern: "8d8bd494-d909-4e67-a052-7e8b5aaeb5e4" # A bogus path that should never exist
+      junit-filename-pattern: false

.gitignore

@@ -47,6 +47,8 @@ npm-debug.log*
 .tern-project
 .nyc_output
 .ci/pipeline-library/build/
+.ci/runbld
+.ci/bash_standard_lib.sh
 .gradle
 
 # apm plugin

Jenkinsfile

@@ -8,50 +8,7 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true)
     ciStats.trackBuild {
       catchError {
         retryable.enable()
-        parallel([
-          'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
-          'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
-          'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
-            'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
-            'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
-            'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
-            'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
-            'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
-            'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
-            'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
-            'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
-            'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
-            'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
-            'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
-            'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
-            'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
-            'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
-            // 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
-          ]),
-          'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
-            'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
-            'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
-            'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
-            'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
-            'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
-            'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
-            'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
-            'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
-            'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
-            'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
-            'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
-            'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
-            'xpack-savedObjectsFieldMetrics': kibanaPipeline.functionalTestProcess('xpack-savedObjectsFieldMetrics', './test/scripts/jenkins_xpack_saved_objects_field_metrics.sh'),
-            // 'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'),
-            'xpack-securitySolutionCypress': { processNumber ->
-              whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) {
-                kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)
-              }
-            },
-
-            // 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
-          ]),
-        ])
+        kibanaPipeline.allCiTasks()
       }
     }
   }

src/dev/ci_setup/checkout_sibling_es.sh

@@ -7,10 +7,11 @@ function checkout_sibling {
   targetDir=$2
   useExistingParamName=$3
   useExisting="$(eval "echo "\$$useExistingParamName"")"
+  repoAddress="https://github.com/"
 
   if [ -z ${useExisting:+x} ]; then
     if [ -d "$targetDir" ]; then
-      echo "I expected a clean workspace but an '${project}' sibling directory already exists in [$PARENT_DIR]!"
+      echo "I expected a clean workspace but an '${project}' sibling directory already exists in [$WORKSPACE]!"
       echo
       echo "Either define '${useExistingParamName}' or remove the existing '${project}' sibling."
       exit 1
@@ -21,8 +22,9 @@ function checkout_sibling {
     cloneBranch=""
 
     function clone_target_is_valid {
+
       echo " -> checking for '${cloneBranch}' branch at ${cloneAuthor}/${project}"
-      if [[ -n "$(git ls-remote --heads "[email protected]:${cloneAuthor}/${project}.git" ${cloneBranch} 2>/dev/null)" ]]; then
+      if [[ -n "$(git ls-remote --heads "${repoAddress}${cloneAuthor}/${project}.git" ${cloneBranch} 2>/dev/null)" ]]; then
         return 0
       else
         return 1
@@ -71,7 +73,7 @@ function checkout_sibling {
       fi
 
       echo " -> checking out '${cloneBranch}' branch from ${cloneAuthor}/${project}..."
-      git clone -b "$cloneBranch" "[email protected]:${cloneAuthor}/${project}.git" "$targetDir" --depth=1
+      git clone -b "$cloneBranch" "${repoAddress}${cloneAuthor}/${project}.git" "$targetDir" --depth=1
       echo " -> checked out ${project} revision: $(git -C "${targetDir}" rev-parse HEAD)"
       echo
     }
@@ -87,12 +89,12 @@ function checkout_sibling {
   fi
 }
 
-checkout_sibling "elasticsearch" "${PARENT_DIR}/elasticsearch" "USE_EXISTING_ES"
+checkout_sibling "elasticsearch" "${WORKSPACE}/elasticsearch" "USE_EXISTING_ES"
 export TEST_ES_FROM=${TEST_ES_FROM:-snapshot}
 
 # Set the JAVA_HOME based on the Java property file in the ES repo
 # This assumes the naming convention used on CI (ex: ~/.java/java10)
-ES_DIR="$PARENT_DIR/elasticsearch"
+ES_DIR="$WORKSPACE/elasticsearch"
 ES_JAVA_PROP_PATH=$ES_DIR/.ci/java-versions.properties
 
 

src/dev/ci_setup/setup_env.sh

@@ -53,6 +53,8 @@ export PARENT_DIR="$parentDir"
 kbnBranch="$(jq -r .branch "$KIBANA_DIR/package.json")"
 export KIBANA_PKG_BRANCH="$kbnBranch"
 
+export WORKSPACE="${WORKSPACE:-$PARENT_DIR}"
+
 ###
 ### download node
 ###
@@ -161,7 +163,7 @@ export -f checks-reporter-with-killswitch
 
 source "$KIBANA_DIR/src/dev/ci_setup/load_env_keys.sh"
 
-ES_DIR="$PARENT_DIR/elasticsearch"
+ES_DIR="$WORKSPACE/elasticsearch"
 ES_JAVA_PROP_PATH=$ES_DIR/.ci/java-versions.properties
 
 if [[ -d "$ES_DIR" && -f "$ES_JAVA_PROP_PATH" ]]; then

src/dev/notice/generate_notice_from_source.ts

@@ -49,8 +49,10 @@ export async function generateNoticeFromSource({ productName, directory, log }:
     ignore: [
       '{node_modules,build,target,dist,data,built_assets}/**',
       'packages/*/{node_modules,build,target,dist}/**',
+      'src/plugins/*/{node_modules,build,target,dist}/**',
       'x-pack/{node_modules,build,target,dist,data}/**',
       'x-pack/packages/*/{node_modules,build,target,dist}/**',
+      'x-pack/plugins/*/{node_modules,build,target,dist}/**',
     ],
   };
 

tasks/config/karma.js

@@ -110,7 +110,7 @@ module.exports = function (grunt) {
       customLaunchers: {
         Chrome_Headless: {
           base: 'Chrome',
-          flags: ['--headless', '--disable-gpu', '--remote-debugging-port=9222'],
+          flags: ['--headless', '--disable-gpu', '--remote-debugging-port=9222', '--no-sandbox'],
         },
       },
 

tasks/test_jest.js

@@ -22,18 +22,18 @@ const { resolve } = require('path');
 module.exports = function (grunt) {
   grunt.registerTask('test:jest', function () {
     const done = this.async();
-    runJest(resolve(__dirname, '../scripts/jest.js')).then(done, done);
+    runJest(resolve(__dirname, '../scripts/jest.js'), ['--maxWorkers=10']).then(done, done);
   });
 
   grunt.registerTask('test:jest_integration', function () {
     const done = this.async();
     runJest(resolve(__dirname, '../scripts/jest_integration.js')).then(done, done);
   });
 
-  function runJest(jestScript) {
+  function runJest(jestScript, args = []) {
     const serverCmd = {
       cmd: 'node',
-      args: [jestScript, '--ci'],
+      args: [jestScript, '--ci', ...args],
       opts: { stdio: 'inherit' },
     };
 

test/scripts/checks/doc_api_changes.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+yarn run grunt run:checkDocApiChanges

test/scripts/checks/file_casing.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+yarn run grunt run:checkFileCasing

test/scripts/checks/i18n.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+yarn run grunt run:i18nCheck

test/scripts/checks/licenses.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+yarn run grunt run:licenses

test/scripts/checks/lock_file_symlinks.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+yarn run grunt run:checkLockfileSymlinks

test/scripts/checks/test_hardening.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+yarn run grunt run:test_hardening

test/scripts/checks/test_projects.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+yarn run grunt run:test_projects

test/scripts/checks/ts_projects.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+yarn run grunt run:checkTsProjects

test/scripts/checks/type_check.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+yarn run grunt run:typeCheck

test/scripts/checks/verify_dependency_versions.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+yarn run grunt run:verifyDependencyVersions

test/scripts/checks/verify_notice.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+yarn run grunt run:verifyNotice

test/scripts/jenkins_build_kibana.sh

@@ -2,19 +2,9 @@
 
 source src/dev/ci_setup/setup_env.sh
 
-echo " -> building examples separate from test plugins"
-node scripts/build_kibana_platform_plugins \
-  --oss \
-  --examples \
-  --verbose;
-
-echo " -> building test plugins"
-node scripts/build_kibana_platform_plugins \
-  --oss \
-  --no-examples \
-  --scan-dir "$KIBANA_DIR/test/plugin_functional/plugins" \
-  --scan-dir "$KIBANA_DIR/test/interpreter_functional/plugins" \
-  --verbose;
+if [[ ! "$TASK_QUEUE_PROCESS_ID" ]]; then
+  ./test/scripts/jenkins_build_plugins.sh
+fi
 
 # doesn't persist, also set in kibanaPipeline.groovy
 export KBN_NP_PLUGINS_BUILT=true
@@ -26,4 +16,7 @@ yarn run grunt functionalTests:ensureAllTestsInCiGroup;
 if [[ -z "$CODE_COVERAGE" ]] ; then
   echo " -> building and extracting OSS Kibana distributable for use in functional tests"
   node scripts/build --debug --oss
+
+  mkdir -p "$WORKSPACE/kibana-build-oss"
+  cp -pR build/oss/kibana-*-SNAPSHOT-linux-x86_64/. $WORKSPACE/kibana-build-oss/
 fi

test/scripts/jenkins_build_plugins.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+echo " -> building examples separate from test plugins"
+node scripts/build_kibana_platform_plugins \
+  --oss \
+  --examples \
+  --workers 6 \
+  --verbose
+
+echo " -> building kibana platform plugins"
+node scripts/build_kibana_platform_plugins \
+  --oss \
+  --no-examples \
+  --scan-dir "$KIBANA_DIR/test/plugin_functional/plugins" \
+  --scan-dir "$KIBANA_DIR/test/interpreter_functional/plugins" \
+  --workers 6 \
+  --verbose

test/scripts/jenkins_ci_group.sh

@@ -5,7 +5,7 @@ source test/scripts/jenkins_test_setup_oss.sh
 if [[ -z "$CODE_COVERAGE" ]]; then
   checks-reporter-with-killswitch "Functional tests / Group ${CI_GROUP}" yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}";
 
-  if [ "$CI_GROUP" == "1" ]; then
+  if [[ ! "$TASK_QUEUE_PROCESS_ID" && "$CI_GROUP" == "1" ]]; then
     source test/scripts/jenkins_build_kbn_sample_panel_action.sh
     yarn run grunt run:pluginFunctionalTestsRelease --from=source;
     yarn run grunt run:exampleFunctionalTestsRelease --from=source;

test/scripts/jenkins_plugin_functional.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+source test/scripts/jenkins_test_setup_oss.sh
+
+cd test/plugin_functional/plugins/kbn_sample_panel_action;
+if [[ ! -d "target" ]]; then
+  yarn build;
+fi
+cd -;
+
+pwd
+
+yarn run grunt run:pluginFunctionalTestsRelease --from=source;
+yarn run grunt run:exampleFunctionalTestsRelease --from=source;
+yarn run grunt run:interpreterFunctionalTestsRelease;

test/scripts/jenkins_security_solution_cypress.sh

@@ -1,12 +1,6 @@
 #!/usr/bin/env bash
 
-source test/scripts/jenkins_test_setup.sh
-
-installDir="$PARENT_DIR/install/kibana"
-destDir="${installDir}-${CI_WORKER_NUMBER}"
-cp -R "$installDir" "$destDir"
-
-export KIBANA_INSTALL_DIR="$destDir"
+source test/scripts/jenkins_test_setup_xpack.sh
 
 echo " -> Running security solution cypress tests"
 cd "$XPACK_DIR"

test/scripts/jenkins_setup_parallel_workspace.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+set -e
+
+CURRENT_DIR=$(pwd)
+
+# Copy everything except node_modules into the current workspace
+rsync -a ${WORKSPACE}/kibana/* . --exclude node_modules
+rsync -a ${WORKSPACE}/kibana/.??* .
+
+# Symlink all non-root, non-fixture node_modules into our new workspace
+cd ${WORKSPACE}/kibana
+find . -type d -name node_modules -not -path '*__fixtures__*' -not -path './node_modules*' -prune -print0 | xargs -0I % ln -s "${WORKSPACE}/kibana/%" "${CURRENT_DIR}/%"
+find . -type d -wholename '*__fixtures__*node_modules' -not -path './node_modules*' -prune -print0 | xargs -0I % cp -R "${WORKSPACE}/kibana/%" "${CURRENT_DIR}/%"
+cd "${CURRENT_DIR}"
+
+# Symlink all of the individual root-level node_modules into the node_modules/ directory
+mkdir -p node_modules
+ln -s ${WORKSPACE}/kibana/node_modules/* node_modules/
+ln -s ${WORKSPACE}/kibana/node_modules/.??* node_modules/
+
+# Copy a few node_modules instead of symlinking them. They don't work correctly if symlinked
+unlink node_modules/@kbn
+unlink node_modules/css-loader
+unlink node_modules/style-loader
+
+# packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts will fail if this is a symlink
+unlink node_modules/val-loader
+
+cp -R ${WORKSPACE}/kibana/node_modules/@kbn node_modules/
+cp -R ${WORKSPACE}/kibana/node_modules/css-loader node_modules/
+cp -R ${WORKSPACE}/kibana/node_modules/style-loader node_modules/
+cp -R ${WORKSPACE}/kibana/node_modules/val-loader node_modules/