Remove matrix build support

.ci/Jenkinsfile_coverage

@@ -16,14 +16,14 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
                 withEnv([
                   'NODE_ENV=test' // Needed for jest tests only
                 ]) {
-                  kibanaPipeline.legacyJobRunner('kibana-intake')()
+                  kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh')()
                 }
               },
               'x-pack-intake-agent': {
                 withEnv([
                   'NODE_ENV=test' // Needed for jest tests only
                 ]) {
-                  kibanaPipeline.legacyJobRunner('x-pack-intake')()
+                  kibanaPipeline.intakeWorker('x-pack-intake', './test/scripts/jenkins_xpack.sh')()
                 }
               },
               'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -26,8 +26,8 @@ timeout(time: 120, unit: 'MINUTES') {
         withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
           parallel([
             // TODO we just need to run integration tests from intake?
-            'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
-            'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
+            'kibana-intake-agent': kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh'),
+            'x-pack-intake-agent': kibanaPipeline.intakeWorker('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
             'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
               'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
               'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),

.ci/jobs.yml

@@ -1,3 +1,5 @@
+# This file is needed by functionalTests:ensureAllTestsInCiGroup for the list of ciGroups. That must be changed before this file can be removed
+
 JOB:
   - kibana-intake
   - x-pack-intake

Jenkinsfile

@@ -10,8 +10,8 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
         githubPr.withDefaultPrComments {
           catchError {
             parallel([
-              'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
-              'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
+              'kibana-intake-agent': kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh'),
+              'x-pack-intake-agent': kibanaPipeline.intakeWorker('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
               'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
                 'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') }),
                 'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),

test/scripts/jenkins_accessibility.sh

@@ -1,23 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
-  source src/dev/ci_setup/setup_env.sh
-fi
-
-export TEST_BROWSER_HEADLESS=1
-
-if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-  yarn run grunt functionalTests:ensureAllTestsInCiGroup;
-  node scripts/build --debug --oss;
-else
-  installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)"
-  destDir=${installDir}-${CI_WORKER_NUMBER}
-  cp -R "$installDir" "$destDir"
-
-  export KIBANA_INSTALL_DIR="$destDir"
-fi
+source test/scripts/jenkins_test_setup_oss.sh
 
 checks-reporter-with-killswitch "Kibana accessibility tests" \
   node scripts/functional_tests \

test/scripts/jenkins_ci_group.sh

@@ -1,19 +1,8 @@
 #!/usr/bin/env bash
 
-source test/scripts/jenkins_test_setup.sh
-
-if [[ -z "$CODE_COVERAGE" ]] ; then
-  if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-    yarn run grunt functionalTests:ensureAllTestsInCiGroup;
-    node scripts/build --debug --oss;
-  else
-    installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)"
-    destDir=${installDir}-${CI_WORKER_NUMBER}
-    cp -R "$installDir" "$destDir"
-
-    export KIBANA_INSTALL_DIR="$destDir"
-  fi
+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
@@ -24,8 +13,6 @@ if [[ -z "$CODE_COVERAGE" ]] ; then
   fi
 else
   echo " -> Running Functional tests with code coverage"
-
   export NODE_OPTIONS=--max_old_space_size=8192
-
   yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}";
 fi

test/scripts/jenkins_firefox_smoke.sh

@@ -1,22 +1,6 @@
 #!/usr/bin/env bash
 
-source test/scripts/jenkins_test_setup.sh
-
-if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-  node scripts/build --debug --oss;
-  linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-oss-*-linux-x86_64.tar.gz')"
-  installDir="$PARENT_DIR/install/kibana"
-  mkdir -p "$installDir"
-  tar -xzf "$linuxBuild" -C "$installDir" --strip=1
-else
-  installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)"
-  destDir=${installDir}-${CI_WORKER_NUMBER}
-  cp -R "$installDir" "$destDir"
-
-  export KIBANA_INSTALL_DIR="$destDir"
-fi
-
-export TEST_BROWSER_HEADLESS=1
+source test/scripts/jenkins_test_setup_oss.sh
 
 checks-reporter-with-killswitch "Firefox smoke test" \
   node scripts/functional_tests \

test/scripts/jenkins_test_setup.sh

@@ -1,11 +1,9 @@
+#!/usr/bin/env bash
+
 set -e
 
 function post_work() {
   set +e
-  if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-    node "$KIBANA_DIR/scripts/report_failed_tests"
-  fi
-
   if [[ -z "$REMOVE_KIBANA_INSTALL_DIR" && -z "$KIBANA_INSTALL_DIR" && -d "$KIBANA_INSTALL_DIR" ]]; then
     rm -rf "$REMOVE_KIBANA_INSTALL_DIR"
   fi
@@ -15,6 +13,4 @@ trap 'post_work' EXIT
 
 export TEST_BROWSER_HEADLESS=1
 
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
-  source src/dev/ci_setup/setup_env.sh
-fi
+source src/dev/ci_setup/setup_env.sh

test/scripts/jenkins_test_setup_oss.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+source test/scripts/jenkins_test_setup.sh
+
+if [[ -z "$CODE_COVERAGE" ]] ; then
+  installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)"
+  destDir=${installDir}-${CI_WORKER_NUMBER}
+  cp -R "$installDir" "$destDir"
+
+  export KIBANA_INSTALL_DIR="$destDir"
+fi

test/scripts/jenkins_test_setup_xpack.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+source test/scripts/jenkins_test_setup.sh
+
+if [[ -z "$CODE_COVERAGE" ]]; then
+  installDir="$PARENT_DIR/install/kibana"
+  destDir="${installDir}-${CI_WORKER_NUMBER}"
+  cp -R "$installDir" "$destDir"
+
+  export KIBANA_INSTALL_DIR="$destDir"
+
+  cd "$XPACK_DIR"
+fi

test/scripts/jenkins_unit.sh

@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
-
-export TEST_BROWSER_HEADLESS=1
+source test/scripts/jenkins_test_setup.sh
 
 if [[ -z "$CODE_COVERAGE" ]] ; then
   "$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:unit --dev;

test/scripts/jenkins_visual_regression.sh

@@ -1,22 +1,8 @@
 #!/usr/bin/env bash
 
-source test/scripts/jenkins_test_setup.sh
+source test/scripts/jenkins_test_setup_xpack.sh
 source "$KIBANA_DIR/src/dev/ci_setup/setup_percy.sh"
 
-if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-  node scripts/build --debug --oss;
-  linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-oss-*-linux-x86_64.tar.gz')"
-  installDir="$PARENT_DIR/install/kibana"
-  mkdir -p "$installDir"
-  tar -xzf "$linuxBuild" -C "$installDir" --strip=1
-else
-  installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)"
-  destDir=${installDir}-${CI_WORKER_NUMBER}
-  cp -R "$installDir" "$destDir"
-
-  export KIBANA_INSTALL_DIR="$destDir"
-fi
-
 checks-reporter-with-killswitch "Kibana visual regression tests" \
   yarn run percy exec -t 500 \
   node scripts/functional_tests \

test/scripts/jenkins_xpack.sh

@@ -1,35 +1,33 @@
 #!/usr/bin/env bash
 
-set -e
-
-export TEST_BROWSER_HEADLESS=1
+source test/scripts/jenkins_test_setup.sh
 
 if [[ -z "$CODE_COVERAGE" ]] ; then
   echo " -> Running mocha tests"
   cd "$XPACK_DIR"
   checks-reporter-with-killswitch "X-Pack Karma Tests" yarn test:browser
   echo ""
   echo ""
-    
+
   echo " -> Running jest tests"
   cd "$XPACK_DIR"
   checks-reporter-with-killswitch "X-Pack Jest" node scripts/jest --ci --verbose
   echo ""
   echo ""
-    
+
   echo " -> Running SIEM cyclic dependency test"
   cd "$XPACK_DIR"
   checks-reporter-with-killswitch "X-Pack SIEM cyclic dependency test" node legacy/plugins/siem/scripts/check_circular_deps
   echo ""
   echo ""
-    
+
   # FAILING: https://github.com/elastic/kibana/issues/44250
   # echo " -> Running jest contracts tests"
   # cd "$XPACK_DIR"
   # SLAPSHOT_ONLINE=true CONTRACT_ONLINE=true node scripts/jest_contract.js --ci --verbose
   # echo ""
   # echo ""
-    
+
   # echo " -> Running jest integration tests"
   # cd "$XPACK_DIR"
   # node scripts/jest_integration --ci --verbose
@@ -48,4 +46,4 @@ else
     ../target/kibana-coverage/jest/xpack-coverage-final.json
   echo ""
   echo ""
-fi
+fi

test/scripts/jenkins_xpack_accessibility.sh

@@ -1,32 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
-  source src/dev/ci_setup/setup_env.sh
-fi
-
-if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-  echo " -> building and extracting default Kibana distributable for use in functional tests"
-  node scripts/build --debug --no-oss
-
-  linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
-  installDir="$PARENT_DIR/install/kibana"
-
-  mkdir -p "$installDir"
-  tar -xzf "$linuxBuild" -C "$installDir" --strip=1
-
-  export KIBANA_INSTALL_DIR="$installDir"
-else
-  installDir="$PARENT_DIR/install/kibana"
-  destDir="${installDir}-${CI_WORKER_NUMBER}"
-  cp -R "$installDir" "$destDir"
-
-  export KIBANA_INSTALL_DIR="$destDir"
-fi
-
-export TEST_BROWSER_HEADLESS=1
-cd "$XPACK_DIR"
+source test/scripts/jenkins_test_setup_xpack.sh
 
 checks-reporter-with-killswitch "X-Pack accessibility tests" \
   node scripts/functional_tests \

test/scripts/jenkins_xpack_ci_group.sh

@@ -1,47 +1,9 @@
 #!/usr/bin/env bash
 
-source test/scripts/jenkins_test_setup.sh
-
-if [[ -z "$CODE_COVERAGE" ]] ; then
-  if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-    echo " -> Ensuring all functional tests are in a ciGroup"
-    cd "$XPACK_DIR"
-    node scripts/functional_tests --assert-none-excluded \
-      --include-tag ciGroup1 \
-      --include-tag ciGroup2 \
-      --include-tag ciGroup3 \
-      --include-tag ciGroup4 \
-      --include-tag ciGroup5 \
-      --include-tag ciGroup6 \
-      --include-tag ciGroup7 \
-      --include-tag ciGroup8 \
-      --include-tag ciGroup9 \
-      --include-tag ciGroup10
-  fi
-
-  cd "$KIBANA_DIR"
-
-  if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-    echo " -> building and extracting default Kibana distributable for use in functional tests"
-    node scripts/build --debug --no-oss
-
-    linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
-    installDir="$PARENT_DIR/install/kibana"
-
-    mkdir -p "$installDir"
-    tar -xzf "$linuxBuild" -C "$installDir" --strip=1
-
-    export KIBANA_INSTALL_DIR="$installDir"
-  else
-    installDir="$PARENT_DIR/install/kibana"
-    destDir="${installDir}-${CI_WORKER_NUMBER}"
-    cp -R "$installDir" "$destDir"
-
-    export KIBANA_INSTALL_DIR="$destDir"
-  fi
+source test/scripts/jenkins_test_setup_xpack.sh
 
+if [[ -z "$CODE_COVERAGE" ]]; then
   echo " -> Running functional and api tests"
-  cd "$XPACK_DIR"
 
   checks-reporter-with-killswitch "X-Pack Chrome Functional tests / Group ${CI_GROUP}" \
     node scripts/functional_tests \
@@ -53,9 +15,6 @@ if [[ -z "$CODE_COVERAGE" ]] ; then
   echo ""
 else
   echo " -> Running X-Pack functional tests with code coverage"
-  cd "$XPACK_DIR"
-
   export NODE_OPTIONS=--max_old_space_size=8192
-
   node scripts/functional_tests --debug --include-tag "ciGroup$CI_GROUP"
 fi