-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[8.14](backport #39126) Beats DRA pipeline #39199
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ef09320
Beats DRA pipeline (#39126)
pazone 3efb10f
Merge branch '8.14' of github.com:elastic/beats into mergify/bp/8.14/…
pazone 634a2a6
Fixes for Buildkite packaging pipeline (#39207)
dliappis 262c9a9
Fix BK DRA pipeline (#39212)
dliappis 20c6c00
Fix permissions for packaging (#39218)
alexsapran 3e10895
Added DEV flag to snapshot. prepare-release-manager.sh staging param …
pazone File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
### Beats Packaging pipeline | ||
[Buildkite packaging pipeline](https://buildkite.com/elastic/beats-packaging-pipeline) is used to build and publish the packages for the Beats. The pipeline is triggered by a commit to the `main` or release branches. | ||
The pipeline definition is located in the `.buildkite/packaging.pipeline.yml` | ||
|
||
### Triggers | ||
Staging packaging DRA is triggered for release branches only. | ||
Snapshot is triggered for `main` and release branches. | ||
|
||
### Pipeline steps | ||
|
||
#### Beats dashboard | ||
Generates `build/distributions/dependencies.csv` and `tar.gz` and adds them to the `beats-dashboards` artifact. This is required by the release-manager configuration. | ||
|
||
#### Packaging snapshot/staging | ||
|
||
- Builds the Beats packages for all supported platforms and architectures (`mage package, mage ironbank`) | ||
- Copies artifacts `build/distributions/<beat>/` directory and adds it as an artifact, where `<beat>` is the corresponding beat name. | ||
- x-pack artifacts are also copied to `build/distributions/<beat>/` directory, where `<beat>` is the name of the beat. For example, `auditbeat`, not `x-pack/auditbeat`. It's required for the DRA publish step by [release-manager configuration](https://github.com/elastic/infra/blob/master/cd/release/release-manager/project-configs/master/beats.gradle). | ||
|
||
#### DRA publish | ||
Downloads the artifacts from the `packaging snapshot/staging` step and publishes them to the Elastic DRA registry. | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,237 @@ | ||
# yaml-language-server: $schema=https://github.com/raw/buildkite/pipeline-schema/main/schema.json | ||
# TODO: Pre-cache beats-dev/golang-crossbuild container image | ||
|
||
env: | ||
ASDF_MAGE_VERSION: 1.15.0 | ||
AWS_ARM_INSTANCE_TYPE: "m6g.xlarge" | ||
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64" | ||
GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8" | ||
IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204" | ||
|
||
PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64" | ||
PLATFORMS_ARM: "linux/arm64" | ||
|
||
steps: | ||
- group: Beats dashboards | ||
key: dashboards | ||
steps: | ||
- label: Snapshot dashboards | ||
if: build.branch =~ /^\d+\.\d+$$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true" | ||
key: dashboards-snapshot | ||
# TODO: container with go and make | ||
agents: | ||
provider: gcp | ||
image: "${IMAGE_UBUNTU_X86_64}" | ||
machineType: "${GCP_DEFAULT_MACHINE_TYPE}" | ||
commands: | ||
- make build/distributions/dependencies.csv | ||
- make beats-dashboards | ||
env: | ||
SNAPSHOT: true | ||
DEV: true | ||
artifact_paths: | ||
- build/distributions/**/* | ||
|
||
- label: Staging dashboards | ||
if: build.branch =~ /^\d+\.\d+$$/ | ||
key: dashboards-staging | ||
# TODO: container with go and make | ||
agents: | ||
provider: gcp | ||
image: "${IMAGE_UBUNTU_X86_64}" | ||
machineType: "${GCP_DEFAULT_MACHINE_TYPE}" | ||
commands: | ||
- make build/distributions/dependencies.csv | ||
- make beats-dashboards | ||
env: | ||
SNAPSHOT: false | ||
DEV: false | ||
artifact_paths: | ||
- build/distributions/**/* | ||
|
||
- group: Packaging snapshot | ||
if: build.branch =~ /^\d+\.\d+$$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true" | ||
key: packaging-snapshot | ||
steps: | ||
- label: "SNAPSHOT: {{matrix}}" | ||
env: | ||
PLATFORMS: "${PLATFORMS}" | ||
SNAPSHOT: true | ||
DEV: true | ||
command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}" | ||
agents: | ||
provider: gcp | ||
image: "${IMAGE_UBUNTU_X86_64}" | ||
machineType: "${GCP_DEFAULT_MACHINE_TYPE}" | ||
artifact_paths: | ||
- build/distributions/**/* | ||
matrix: | ||
- auditbeat | ||
- filebeat | ||
- heartbeat | ||
- metricbeat | ||
- packetbeat | ||
- winlogbeat | ||
- x-pack/auditbeat | ||
- x-pack/dockerlogbeat | ||
- x-pack/filebeat | ||
- x-pack/functionbeat | ||
- x-pack/heartbeat | ||
- x-pack/metricbeat | ||
- x-pack/osquerybeat | ||
- x-pack/packetbeat | ||
- x-pack/winlogbeat | ||
|
||
- label: "SNAPSHOT: {{matrix}} docker Linux/arm64" | ||
env: | ||
PLATFORMS: "${PLATFORMS_ARM}" | ||
PACKAGES: "docker" | ||
SNAPSHOT: true | ||
DEV: true | ||
command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}" | ||
agents: | ||
provider: "aws" | ||
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" | ||
instanceType: "${AWS_ARM_INSTANCE_TYPE}" | ||
artifact_paths: | ||
- build/distributions/**/* | ||
matrix: | ||
- auditbeat | ||
- filebeat | ||
- heartbeat | ||
- metricbeat | ||
- packetbeat | ||
- x-pack/auditbeat | ||
- x-pack/dockerlogbeat | ||
- x-pack/filebeat | ||
- x-pack/heartbeat | ||
- x-pack/metricbeat | ||
- x-pack/packetbeat | ||
|
||
## Agentbeat needs more CPUs because it builds many other beats | ||
- label: "SNAPSHOT: x-pack/agentbeat" | ||
env: | ||
PLATFORMS: "${PLATFORMS}" | ||
SNAPSHOT: true | ||
DEV: true | ||
command: ".buildkite/scripts/packaging/package-dra.sh x-pack/agentbeat" | ||
agents: | ||
provider: gcp | ||
image: "${IMAGE_UBUNTU_X86_64}" | ||
machineType: "c2-standard-16" | ||
artifact_paths: | ||
- build/distributions/**/* | ||
|
||
- group: Packaging Staging | ||
|
||
key: packaging-staging | ||
## Only for release | ||
if: build.branch =~ /^\d+\.\d+$$/ | ||
steps: | ||
- label: "STAGING: {{matrix}}" | ||
env: | ||
PLATFORMS: "${PLATFORMS}" | ||
SNAPSHOT: false | ||
DEV: false | ||
command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}" | ||
agents: | ||
provider: gcp | ||
image: "${IMAGE_UBUNTU_X86_64}" | ||
machineType: "${GCP_DEFAULT_MACHINE_TYPE}" | ||
artifact_paths: | ||
- build/distributions/**/* | ||
matrix: | ||
- auditbeat | ||
- filebeat | ||
- heartbeat | ||
- metricbeat | ||
- packetbeat | ||
- winlogbeat | ||
- x-pack/auditbeat | ||
- x-pack/dockerlogbeat | ||
- x-pack/filebeat | ||
- x-pack/functionbeat | ||
- x-pack/heartbeat | ||
- x-pack/metricbeat | ||
- x-pack/osquerybeat | ||
- x-pack/packetbeat | ||
- x-pack/winlogbeat | ||
|
||
- label: "STAGING: {{matrix}} docker Linux/arm64" | ||
env: | ||
PLATFORMS: "${PLATFORMS_ARM}" | ||
PACKAGES: "docker" | ||
SNAPSHOT: false | ||
DEV: false | ||
command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}" | ||
agents: | ||
provider: "aws" | ||
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" | ||
instanceType: "${AWS_ARM_INSTANCE_TYPE}" | ||
artifact_paths: | ||
- build/distributions/** | ||
matrix: | ||
- auditbeat | ||
- filebeat | ||
- heartbeat | ||
- metricbeat | ||
- packetbeat | ||
- x-pack/auditbeat | ||
- x-pack/dockerlogbeat | ||
- x-pack/filebeat | ||
- x-pack/heartbeat | ||
- x-pack/metricbeat | ||
- x-pack/packetbeat | ||
|
||
## Agentbeat needs more CPUs because it builds many other beats | ||
- label: "STAGING: x-pack/agentbeat" | ||
env: | ||
PLATFORMS: "${PLATFORMS}" | ||
SNAPSHOT: false | ||
DEV: false | ||
command: ".buildkite/scripts/packaging/package-dra.sh x-pack/agentbeat" | ||
agents: | ||
provider: gcp | ||
image: "${IMAGE_UBUNTU_X86_64}" | ||
machineType: "c2-standard-16" | ||
artifact_paths: | ||
- build/distributions/**/* | ||
|
||
- group: DRA publish | ||
key: dra | ||
steps: | ||
- label: DRA Snapshot | ||
## Only for release branches and main | ||
if: build.branch =~ /^\d+\.\d+$$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true" | ||
key: dra-snapshot | ||
env: | ||
DRA_WORKFLOW: snapshot | ||
depends_on: | ||
- packaging-snapshot | ||
- dashboards-snapshot | ||
command: | | ||
buildkite-agent artifact download "build/**/*" . | ||
.buildkite/scripts/packaging/prepare-release-manager.sh snapshot | ||
.buildkite/scripts/dra.sh | ||
agents: | ||
provider: gcp | ||
image: "${IMAGE_UBUNTU_X86_64}" | ||
machineType: "${GCP_DEFAULT_MACHINE_TYPE}" | ||
|
||
- label: DRA Staging | ||
## Only for release branches | ||
if: build.branch =~ /^\d+\.\d+$$/ | ||
key: dra-staging | ||
env: | ||
DRA_WORKFLOW: staging | ||
depends_on: | ||
- packaging-staging | ||
- dashboards-staging | ||
command: | | ||
buildkite-agent artifact download "build/**" . | ||
.buildkite/scripts/packaging/prepare-release-manager.sh staging | ||
.buildkite/scripts/dra.sh | ||
agents: | ||
provider: gcp | ||
image: "${IMAGE_UBUNTU_X86_64}" | ||
machineType: "${GCP_DEFAULT_MACHINE_TYPE}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
#!/usr/bin/env bash | ||
|
||
# TODO: uncomment out below when Jenkins packaging has been stopped | ||
# if [[ "$DRY_RUN" == "true" ]]; then | ||
# echo "~~~ Running in dry-run mode -- will NOT publish artifacts" | ||
# DRY_RUN="--dry-run" | ||
# else | ||
# echo "~~~ Running in publish mode" | ||
# DRY_RUN="" | ||
# fi | ||
|
||
# TODO: delete the conditional below (and replace it with the above, uncommented out, section) after Jenkins packaging has been stopped | ||
if [[ "$DRY_RUN" == "false" ]]; then | ||
echo "~~~ Running in publish mode" | ||
DRY_RUN="" | ||
else | ||
echo "~~~ Running in dry-run mode -- will NOT publish artifacts" | ||
DRY_RUN="--dry-run" | ||
fi | ||
|
||
set -euo pipefail | ||
|
||
# DRA_BRANCH can be used for manually testing packaging with PRs | ||
# e.g. define `DRA_BRANCH="main"` and `RUN_SNAPSHOT="true"` under Options/Environment Variables in the Buildkite UI after clicking new Build | ||
BRANCH="${DRA_BRANCH:="${BUILDKITE_BRANCH:=""}"}" | ||
|
||
BEAT_VERSION=$(make get-version) | ||
|
||
CI_DRA_ROLE_PATH="kv/ci-shared/release/dra-role" | ||
|
||
function release_manager_login { | ||
DRA_CREDS_SECRET=$(retry -t 5 -- vault kv get -field=data -format=json ${CI_DRA_ROLE_PATH}) | ||
VAULT_ADDR_SECRET=$(echo ${DRA_CREDS_SECRET} | jq -r '.vault_addr') | ||
VAULT_ROLE_ID_SECRET=$(echo ${DRA_CREDS_SECRET} | jq -r '.role_id') | ||
VAULT_SECRET=$(echo ${DRA_CREDS_SECRET} | jq -r '.secret_id') | ||
export VAULT_ADDR_SECRET VAULT_ROLE_ID_SECRET VAULT_SECRET | ||
} | ||
|
||
set +x | ||
release_manager_login | ||
|
||
# required by the release-manager docker image, otherwise we hit: | ||
# > java.io.FileNotFoundException: /artifacts/build/distributions/agentbeat/agentbeat-8.15.0-SNAPSHOT-darwin-x86_64.tar.gz.sha512 (Permission denied) | ||
chmod -R a+r build/* | ||
chmod -R a+w build | ||
|
||
echo "+++ :clipboard: Listing DRA artifacts for version [$BEAT_VERSION], branch [$BRANCH] and workflow [$DRA_WORKFLOW]" | ||
set +x | ||
docker run --rm \ | ||
--name release-manager \ | ||
-e VAULT_ADDR="${VAULT_ADDR_SECRET}" \ | ||
-e VAULT_ROLE_ID="${VAULT_ROLE_ID_SECRET}" \ | ||
-e VAULT_SECRET_ID="${VAULT_SECRET}" \ | ||
--mount type=bind,readonly=false,src="${PWD}",target=/artifacts \ | ||
docker.elastic.co/infra/release-manager:latest \ | ||
cli list \ | ||
--project "beats" \ | ||
--branch "${BRANCH}" \ | ||
--commit "${BUILDKITE_COMMIT}" \ | ||
--workflow "${DRA_WORKFLOW}" \ | ||
--version "${BEAT_VERSION}" \ | ||
--artifact-set "main" | ||
|
||
echo "+++ :hammer_and_pick: Publishing DRA artifacts for version [$BEAT_VERSION], branch [$BRANCH], workflow [$DRA_WORKFLOW] and DRY_RUN: [$DRY_RUN]" | ||
|
||
set +x | ||
docker run --rm \ | ||
--name release-manager \ | ||
-e VAULT_ADDR="${VAULT_ADDR_SECRET}" \ | ||
-e VAULT_ROLE_ID="${VAULT_ROLE_ID_SECRET}" \ | ||
-e VAULT_SECRET_ID="${VAULT_SECRET}" \ | ||
--mount type=bind,readonly=false,src="${PWD}",target=/artifacts \ | ||
docker.elastic.co/infra/release-manager:latest \ | ||
cli collect \ | ||
--project "beats" \ | ||
--branch "${BRANCH}" \ | ||
--commit "${BUILDKITE_COMMIT}" \ | ||
--workflow "${DRA_WORKFLOW}" \ | ||
--version "${BEAT_VERSION}" \ | ||
--artifact-set "main" \ | ||
${DRY_RUN} | tee rm-output.txt | ||
|
||
# extract the summary URL from a release manager output line like: | ||
# Report summary-18.22.0.html can be found at https://artifacts-staging.elastic.co/beats/18.22.0-ABCDEFGH/summary-18.22.0.html | ||
|
||
SUMMARY_URL=$(grep -E '^Report summary-.* can be found at ' rm-output.txt | grep -oP 'https://\S+' | awk '{print $1}') | ||
rm rm-output.txt | ||
|
||
# and make it easily clickable as a Builkite annotation | ||
printf "**Summary link:** [${SUMMARY_URL}](${SUMMARY_URL})\n" | buildkite-agent annotate --style=success |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
#!/usr/bin/env bash | ||
set -ueo pipefail | ||
BEAT_DIR=${1:-""} | ||
|
||
if [ -z "$BEAT_DIR" ]; then | ||
echo "Error: Beat directory must be specified." | ||
exit 1 | ||
fi | ||
|
||
echo "~~~ Packaging : $BEAT_DIR" | ||
|
||
WORKSPACE=$(pwd) | ||
BEAT_NAME_SLUG=$(echo "$BEAT_DIR" | sed 's/x-pack\///g') | ||
|
||
cd $BEAT_DIR | ||
mage package | ||
mage ironbank | ||
|
||
mkdir -p $WORKSPACE/build/distributions/$BEAT_NAME_SLUG | ||
cp build/distributions/* $WORKSPACE/build/distributions/$BEAT_NAME_SLUG/ | ||
cd $WORKSPACE |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we need to skip the lines below if
DRY_RUN == "true"
; @pazone if you are raising a fix formain
, please include it here so that the build doesn't fail when running it with DRY_RUN enabled.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix PR is : #39240