Skip to content

Commit

Permalink
[ci] Remove plugin build (elastic#197125)
Browse files Browse the repository at this point in the history
The platform plugin builds were used when functional tests were, at
times, run from source.
This is mostly no longer a requirement. There are two remaining cypress
scripts that I updated to use the build instead.

With the time saved I'm dropping the number of vCPUs from 16 to 8. These
are mostly underutilized by this step, with the exception of the
distribution plugin build.
  • Loading branch information
jbudz authored and mgadewoll committed Nov 7, 2024
1 parent bb96139 commit 8a3f1be
Show file tree
Hide file tree
Showing 21 changed files with 30 additions and 63 deletions.
4 changes: 2 additions & 2 deletions .buildkite/pipelines/chrome_forward_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ steps:
- wait

- command: .buildkite/scripts/steps/build_kibana.sh
label: Build Kibana Distribution and Plugins
label: Build Kibana Distribution
agents:
machineType: n2-standard-16
machineType: n2-standard-8
preemptible: true
key: build
timeout_in_minutes: 60
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ steps:
provider: gcp
machineType: n2-standard-2

- label: "Build Kibana Distribution and Plugins"
- label: "Build Kibana Distribution"
command: .buildkite/scripts/steps/build_kibana.sh
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-16
machineType: n2-standard-8
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
depends_on: pre-build
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/pipelines/es_snapshots/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ steps:
- wait

- command: .buildkite/scripts/steps/build_kibana.sh
label: Build Kibana Distribution and Plugins
label: Build Kibana Distribution
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-16
machineType: n2-standard-8
preemptible: true
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/pipelines/fips.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ steps:
- wait

- command: .buildkite/scripts/steps/build_kibana.sh
label: Build Kibana Distribution and Plugins
label: Build Kibana Distribution
agents:
machineType: n2-standard-16
machineType: n2-standard-8
preemptible: true
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/flaky_tests/pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ const pipeline = {

steps.push({
command: '.buildkite/scripts/steps/build_kibana.sh',
label: 'Build Kibana Distribution and Plugins',
label: 'Build Kibana Distribution',
agents: expandAgentQueue('c2-8'),
key: 'build',
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''",
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ steps:
- wait

- command: .buildkite/scripts/steps/on_merge_build_and_metrics.sh
label: Build Kibana Distribution and Plugins
label: Build Kibana Distribution
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-16
machineType: n2-standard-8
preemptible: true
key: build
timeout_in_minutes: 60
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/pipelines/on_merge_unsupported_ftrs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/build_kibana.sh
label: Build Kibana Distribution and Plugins
label: Build Kibana Distribution
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-16
machineType: n2-standard-8
preemptible: true
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/pipelines/performance/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ steps:

- wait

- label: '🧑‍🏭 Build Kibana Distribution and Plugins'
- label: '🧑‍🏭 Build Kibana Distribution'
command: .buildkite/scripts/steps/build_kibana.sh
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: c2-standard-16
machineType: n2-standard-8
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ steps:

- wait

- label: ':building_construction: Build Kibana Distribution and Plugins'
- label: ':building_construction: Build Kibana Distribution '
command: .buildkite/scripts/steps/build_kibana.sh
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: c2-standard-16
machineType: n2-standard-8
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"

Expand Down
4 changes: 2 additions & 2 deletions .buildkite/pipelines/pull_request/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ steps:
- wait

- command: .buildkite/scripts/steps/build_kibana.sh
label: Build Kibana Distribution and Plugins
label: Build Kibana Distribution
agents:
machineType: n2-standard-16
machineType: n2-standard-8
preemptible: true
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ steps:

- wait

- label: 'Build Kibana Distribution and Plugins'
- label: 'Build Kibana Distribution'
command: .buildkite/scripts/steps/build_kibana.sh
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-16
machineType: n2-standard-8
preemptible: true
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
Expand Down
7 changes: 0 additions & 7 deletions .buildkite/scripts/build_kibana_plugins.sh

This file was deleted.

5 changes: 1 addition & 4 deletions .buildkite/scripts/download_build_artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ source "$(dirname "$0")/common/util.sh"

if [[ "${KIBANA_BUILD_ID:-}" != "false" ]]; then
if [[ ! -d "$KIBANA_BUILD_LOCATION/bin" ]]; then
echo '--- Downloading Distribution and Plugin artifacts'
echo '--- Downloading Distribution'

cd "$WORKSPACE"

download_artifact kibana-default.tar.gz . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
download_artifact kibana-default-plugins.tar.gz . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"

mkdir -p "$KIBANA_BUILD_LOCATION"
tar -xzf kibana-default.tar.gz -C "$KIBANA_BUILD_LOCATION" --strip=1
Expand All @@ -24,7 +23,5 @@ if [[ "${KIBANA_BUILD_ID:-}" != "false" ]]; then
fi

cd "$KIBANA_DIR"

tar -xzf ../kibana-default-plugins.tar.gz
fi
fi
13 changes: 0 additions & 13 deletions .buildkite/scripts/post_build_kibana_plugins.sh

This file was deleted.

2 changes: 0 additions & 2 deletions .buildkite/scripts/steps/build_kibana.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ set -euo pipefail

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/build_kibana.sh
.buildkite/scripts/build_kibana_plugins.sh
.buildkite/scripts/post_build_kibana_plugins.sh
.buildkite/scripts/post_build_kibana.sh
5 changes: 1 addition & 4 deletions .buildkite/scripts/steps/functional/defend_workflows_burn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ set -euo pipefail

source .buildkite/scripts/steps/functional/common.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/copy_es_snapshot_cache.sh
node scripts/build_kibana_platform_plugins.js

export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
export JOB=kibana-defend-workflows-cypress

buildkite-agent meta-data set "${BUILDKITE_JOB_ID}_is_test_execution_step" 'false'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ set -euo pipefail

source .buildkite/scripts/steps/functional/common.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/copy_es_snapshot_cache.sh
node scripts/build_kibana_platform_plugins.js

export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
export JOB=kibana-defend-workflows-serverless-cypress

buildkite-agent meta-data set "${BUILDKITE_JOB_ID}_is_test_execution_step" 'false'
Expand Down
2 changes: 0 additions & 2 deletions .buildkite/scripts/steps/on_merge_build_and_metrics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@ set -euo pipefail

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/build_kibana.sh
.buildkite/scripts/build_kibana_plugins.sh
.buildkite/scripts/post_build_kibana_plugins.sh
.buildkite/scripts/post_build_kibana.sh
.buildkite/scripts/saved_object_field_metrics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ console.log(JSON.stringify(pipeline, null, 2));
function getBuildJob() {
return {
command: '.buildkite/scripts/steps/build_kibana.sh',
label: 'Build Kibana Distribution and Plugins',
agents: { queue: 'c2-8' },
label: 'Build Kibana Distribution',
agents: { queue: 'n2-8' },
key: BUILD_UUID,
if: `build.env('${KIBANA_BUILD_ID}') == null || build.env('${KIBANA_BUILD_ID}') == ''`,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ console.log(JSON.stringify(pipeline, null, 2));
function getBuildJob() {
return {
command: '.buildkite/scripts/steps/build_kibana.sh',
label: 'Build Kibana Distribution and Plugins',
agents: { queue: 'c2-8' },
label: 'Build Kibana Distribution',
agents: { queue: 'n2-8' },
key: BUILD_UUID,
if: `build.env('${KIBANA_BUILD_ID}') == null || build.env('${KIBANA_BUILD_ID}') == ''`,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ console.log(JSON.stringify(pipeline, null, 2));
function getBuildJob() {
return {
command: '.buildkite/scripts/steps/build_kibana.sh',
label: 'Build Kibana Distribution and Plugins',
agents: { queue: 'c2-8' },
label: 'Build Kibana Distribution',
agents: { queue: 'n2-8' },
key: BUILD_UUID,
if: `build.env('${KIBANA_BUILD_ID}') == null || build.env('${KIBANA_BUILD_ID}') == ''`,
};
Expand Down

0 comments on commit 8a3f1be

Please sign in to comment.