-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Beats DRA pipeline (#39126) * Packaging pipieline resource * Revetred agentbeat pipeline deletion * Cleanup * Test auditbeat packaging pipeline * Fix steps keys * Fix steps keys * Fix env vars * Fix env vars * Fix env vars * Unified artifacts dir * Implemented DRA steps * Test filebeat * Test matrix * Aligned artifacts directories * Aligned artifacts directories * Aligned artifacts directories * Aligned artifacts directories * Debug * Debug * Package all beats * Test DRA snapshot * Test DRA snapshot * Rename artifacts * fix dashboards artifacts * Cleanup * cleanup * No need to install msi tools * Apply suggestions from code review Co-authored-by: Dimitrios Liappis <[email protected]> * Extraced platforms variables * Cleanup * Added RUN_SNAPSHOT condition * Cleanup * Boolean dry-run * Boolean dry-run --------- Co-authored-by: Dimitrios Liappis <[email protected]> (cherry picked from commit c6444db) # Conflicts: # .buildkite/packaging.pipeline.yml * Fixes for Buildkite packaging pipeline (#39207) This PR fixes a number of bugs from #39126 * Fix BK DRA pipeline (#39212) This commit fixes the error "interpolating remaining fields: Expected identifier to start with a letter, got /" * Fix permissions for packaging (#39218) This commit fixes the release-manager error > # > java.io.FileNotFoundException: /artifacts/build/distributions/... (Permission denied) by adjusting the permissions of parent directories. Additionally there are a few logging enhancements to improve debugging, as well as the introduction of a new optional `DRA_BRANCH` environment variable, to help running and debugging via PRs. Relates https://github.com/elastic/ingest-dev/issues/3095 --------- Signed-off-by: Alexandros Sapranidis <[email protected]> Co-authored-by: Dimitrios Liappis <[email protected]> * Added DEV flag to snapshot. prepare-release-manager.sh staging param (#39217) Added DEV flag to snapshot builds. Specified the workflow for prepare-release-manager.sh Relates: https://github.com/elastic/ingest-dev/issues/3095 --------- Signed-off-by: Alexandros Sapranidis <[email protected]> Co-authored-by: Pavel Zorin <[email protected]> Co-authored-by: Dimitrios Liappis <[email protected]> Co-authored-by: Alexandros Sapranidis <[email protected]>
- Loading branch information
1 parent
f950eb8
commit 1ad2d38
Showing
5 changed files
with
412 additions
and
0 deletions.
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://raw.githubusercontent.com/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.