mirror of
https://github.com/elastic/kibana.git
synced 2025-06-27 18:51:07 -04:00
[ci] Remove plugin build (#197125)
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.
This commit is contained in:
parent
f740d953c7
commit
6b7c5b9f04
21 changed files with 30 additions and 63 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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') == ''"
|
||||
|
|
|
@ -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') == ''"
|
||||
|
|
|
@ -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') == ''",
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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') == ''"
|
||||
|
|
|
@ -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') == ''"
|
||||
|
||||
|
|
|
@ -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') == ''"
|
||||
|
||||
|
|
|
@ -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') == ''"
|
||||
|
|
|
@ -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') == ''"
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
echo "--- Build Platform Plugins"
|
||||
THREADS=$(grep -c ^processor /proc/cpuinfo)
|
||||
node scripts/build_kibana_platform_plugins --examples --test-plugins --workers "$THREADS" --no-inspect-workers --no-progress
|
|
@ -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
|
||||
|
@ -24,7 +23,5 @@ if [[ "${KIBANA_BUILD_ID:-}" != "false" ]]; then
|
|||
fi
|
||||
|
||||
cd "$KIBANA_DIR"
|
||||
|
||||
tar -xzf ../kibana-default-plugins.tar.gz
|
||||
fi
|
||||
fi
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
echo "--- Archive built plugins"
|
||||
shopt -s globstar
|
||||
tar -zcf \
|
||||
target/kibana-default-plugins.tar.gz \
|
||||
x-pack/plugins/**/target/public \
|
||||
x-pack/test/**/target/public \
|
||||
examples/**/target/public \
|
||||
x-pack/examples/**/target/public \
|
||||
test/**/target/public
|
|
@ -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
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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}') == ''`,
|
||||
};
|
||||
|
|
|
@ -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}') == ''`,
|
||||
};
|
||||
|
|
|
@ -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}') == ''`,
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue