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

* Revert "temporarily disable firefox functional tests in PRs (elastic#71116)"

This reverts commit 54bd07f.

* Revert "[savedObjects field count] run in baseline job (elastic#70999)"

This reverts commit 53ee7a7.

* Revert "[CI] Add pipeline task queue framework and merge workers into one (elastic#64011)"

This reverts commit 465ed21.

* Revert revert of change to jenkins_xpack_visual_regression.sh

Co-authored-by: spalger <spalger@users.noreply.github.com>

.ci/runbld_no_junit.yml

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

.gitignore

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

Jenkinsfile

@@ -8,7 +8,50 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true)
  ciStats.trackBuild {
  catchError {
  retryable.enable()
- kibanaPipeline.allCiTasks()
+ 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'),
+ ]),
+ ])
  }
  }
  }

src/dev/ci_setup/checkout_sibling_es.sh

@@ -7,11 +7,10 @@ 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 [$WORKSPACE]!"
+ echo "I expected a clean workspace but an '${project}' sibling directory already exists in [$PARENT_DIR]!"
  echo
  echo "Either define '${useExistingParamName}' or remove the existing '${project}' sibling."
  exit 1
@@ -22,9 +21,8 @@ function checkout_sibling {
  cloneBranch=""
 
  function clone_target_is_valid {
-
  echo " -> checking for '${cloneBranch}' branch at ${cloneAuthor}/${project}"
- if [[ -n "$(git ls-remote --heads "${repoAddress}${cloneAuthor}/${project}.git" ${cloneBranch} 2>/dev/null)" ]]; then
+ if [[ -n "$(git ls-remote --heads "git@github.com:${cloneAuthor}/${project}.git" ${cloneBranch} 2>/dev/null)" ]]; then
  return 0
  else
  return 1
@@ -73,7 +71,7 @@ function checkout_sibling {
  fi
 
  echo " -> checking out '${cloneBranch}' branch from ${cloneAuthor}/${project}..."
- git clone -b "$cloneBranch" "${repoAddress}${cloneAuthor}/${project}.git" "$targetDir" --depth=1
+ git clone -b "$cloneBranch" "git@github.com:${cloneAuthor}/${project}.git" "$targetDir" --depth=1
  echo " -> checked out ${project} revision: $(git -C "${targetDir}" rev-parse HEAD)"
  echo
  }
@@ -89,12 +87,12 @@ function checkout_sibling {
  fi
 }
 
-checkout_sibling "elasticsearch" "${WORKSPACE}/elasticsearch" "USE_EXISTING_ES"
+checkout_sibling "elasticsearch" "${PARENT_DIR}/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="$WORKSPACE/elasticsearch"
+ES_DIR="$PARENT_DIR/elasticsearch"
 ES_JAVA_PROP_PATH=$ES_DIR/.ci/java-versions.properties
 
 

src/dev/ci_setup/setup_env.sh

@@ -53,8 +53,6 @@ export PARENT_DIR="$parentDir"
 kbnBranch="$(jq -r .branch "$KIBANA_DIR/package.json")"
 export KIBANA_PKG_BRANCH="$kbnBranch"
 
-export WORKSPACE="${WORKSPACE:-$PARENT_DIR}"
-
 ###
 ### download node
 ###
@@ -163,7 +161,7 @@ export -f checks-reporter-with-killswitch
 
 source "$KIBANA_DIR/src/dev/ci_setup/load_env_keys.sh"
 
-ES_DIR="$WORKSPACE/elasticsearch"
+ES_DIR="$PARENT_DIR/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,10 +49,8 @@ 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', '--no-sandbox'],
+ flags: ['--headless', '--disable-gpu', '--remote-debugging-port=9222'],
  },
  },
 

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'), ['--maxWorkers=10']).then(done, done);
+ runJest(resolve(__dirname, '../scripts/jest.js')).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, args = []) {
+ function runJest(jestScript) {
  const serverCmd = {
  cmd: 'node',
- args: [jestScript, '--ci', ...args],
+ args: [jestScript, '--ci'],
  opts: { stdio: 'inherit' },
  };
 

test/scripts/jenkins_build_kibana.sh

@@ -2,9 +2,19 @@
 
 source src/dev/ci_setup/setup_env.sh
 
-if [[ ! "$TASK_QUEUE_PROCESS_ID" ]]; then
- ./test/scripts/jenkins_build_plugins.sh
-fi
+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;
 
 # doesn't persist, also set in kibanaPipeline.groovy
 export KBN_NP_PLUGINS_BUILT=true
@@ -16,7 +26,4 @@ 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_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 [[ ! "$TASK_QUEUE_PROCESS_ID" && "$CI_GROUP" == "1" ]]; then
+ if [ "$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_security_solution_cypress.sh

@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
 
-source test/scripts/jenkins_test_setup_xpack.sh
+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"
 
 echo " -> Running security solution cypress tests"
 cd "$XPACK_DIR"