From 50343d73fc2b5fbc211b3ed343ad06dddf5dce1b Mon Sep 17 00:00:00 2001
From: Cee Chen <549407+cee-chen@users.noreply.github.com>
Date: Wed, 20 Sep 2023 10:26:09 -0700
Subject: [PATCH] Revert "[INFRA] Parallelize the Buildkite `test` job on PR
 (#7197)"

This reverts commit 57ec9444b5dad6e6ec77db0e910b872462b49e2d.
---
 .../pipelines/pipeline_pull_request_test.yml  | 43 ++------------
 .buildkite/scripts/pipeline_test.sh           | 57 ++++---------------
 2 files changed, 16 insertions(+), 84 deletions(-)

diff --git a/.buildkite/pipelines/pipeline_pull_request_test.yml b/.buildkite/pipelines/pipeline_pull_request_test.yml
index a983a2f1b75..af25c625a9f 100644
--- a/.buildkite/pipelines/pipeline_pull_request_test.yml
+++ b/.buildkite/pipelines/pipeline_pull_request_test.yml
@@ -1,44 +1,9 @@
 # 🏠/.buildkite/pipelines/pipeline_pull_request_test.yml
 
 steps:
-  - command: .buildkite/scripts/pipeline_test.sh
-    label: ":typescript: Linting"
-    agents:
+  - agents:
       provider: "gcp"
-    env:
-      TEST_TYPE: 'lint'
-    if: build.branch != "main" # This job is triggered by the combined test and deploy docs for every PR
-  - command: .buildkite/scripts/pipeline_test.sh
-    label: ":jest: Unit tests"
-    agents:
-      provider: "gcp"
-    env:
-      TEST_TYPE: 'unit'
-    if: build.branch != "main"
-  - command: .buildkite/scripts/pipeline_test.sh
-    label: ":cypress: Cypress tests on React 16"
-    agents:
-      provider: "gcp"
-    env:
-      TEST_TYPE: 'cypress:16'
-    if: build.branch != "main"
-    artifact_paths:
-      - "cypress/react16/screenshots/**/*.png"
-  - command: .buildkite/scripts/pipeline_test.sh
-    label: ":cypress: Cypress tests on React 17"
-    agents:
-      provider: "gcp"
-    env:
-      TEST_TYPE: 'cypress:17'
-    if: build.branch != "main"
-    artifact_paths:
-      - "cypress/react17/screenshots/**/*.png"
-  - command: .buildkite/scripts/pipeline_test.sh
-    label: ":cypress: Cypress tests on React 18"
-    agents:
-      provider: "gcp"
-    env:
-      TEST_TYPE: 'cypress:18'
-    if: build.branch != "main"
+    command: .buildkite/scripts/pipeline_test.sh
+    if: build.branch != "main" # We're skipping testing commits in main for now to maintain parity with previous Jenkins setup
     artifact_paths:
-      - "cypress/react18/screenshots/**/*.png"
+      - "cypress/screenshots/**/*.png"
diff --git a/.buildkite/scripts/pipeline_test.sh b/.buildkite/scripts/pipeline_test.sh
index f80576cbd43..7fef13e2c04 100644
--- a/.buildkite/scripts/pipeline_test.sh
+++ b/.buildkite/scripts/pipeline_test.sh
@@ -2,48 +2,15 @@
 
 set -euo pipefail
 
-DOCKER_OPTIONS=(
-  -i --rm
-  --env GIT_COMMITTER_NAME=test
-  --env GIT_COMMITTER_EMAIL=test
-  --env HOME=/tmp
-  --user="$(id -u):$(id -g)"
-  --volume="$(pwd):/app"
-  --workdir=/app
-  docker.elastic.co/eui/ci:5.3
-)
-
-case $TEST_TYPE in
-  lint)
-    echo "[TASK]: Running linters"
-    DOCKER_OPTIONS+=(bash -c "/opt/yarn*/bin/yarn && yarn cypress install && NODE_OPTIONS=\"--max-old-space-size=2048\" yarn lint")
-    ;;
-
-  unit)
-    echo "[TASK]: Running unit tests"
-    DOCKER_OPTIONS+=(bash -c "/opt/yarn*/bin/yarn && yarn cypress install && NODE_OPTIONS=\"--max-old-space-size=2048\" yarn test-unit")
-    ;;
-
-  cypress:16)
-    echo "[TASK]: Running Cypress tests against React 16"
-    DOCKER_OPTIONS+=(bash -c "/opt/yarn*/bin/yarn && yarn cypress install && NODE_OPTIONS=\"--max-old-space-size=2048\" yarn test-cypress --react-version 16")
-    ;;
-
-  cypress:17)
-    echo "[TASK]: Running Cypress tests against React 17"
-    DOCKER_OPTIONS+=(bash -c "/opt/yarn*/bin/yarn && yarn cypress install && NODE_OPTIONS=\"--max-old-space-size=2048\" yarn test-cypress --react-version 17")
-    ;;
-
-  cypress:18)
-    echo "[TASK]: Running Cypress tests against React 18"
-    DOCKER_OPTIONS+=(bash -c "/opt/yarn*/bin/yarn && yarn cypress install && NODE_OPTIONS=\"--max-old-space-size=2048\" yarn test-cypress")
-    ;;
-
-  *)
-    echo "[ERROR]: Unknown task"
-    echo "Exit code: 1"
-    exit 1
-    ;;
-esac
-
-docker run "${DOCKER_OPTIONS[@]}"
+docker run \
+  -i --rm \
+  --env GIT_COMMITTER_NAME=test \
+  --env GIT_COMMITTER_EMAIL=test \
+  --env HOME=/tmp \
+  --user="$(id -u):$(id -g)" \
+  --volume="$(pwd):/app" \
+  --workdir=/app \
+  docker.elastic.co/eui/ci:5.3 \
+  bash -c "/opt/yarn*/bin/yarn \
+  && yarn cypress install \
+  && NODE_OPTIONS=\"--max-old-space-size=2048\" npm run test-ci"