Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .buildkite/hooks/pre-command
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "auditbeat" || \
"$BUILDKITE_PIPELINE_SLUG" == "beats-macos-tests" || \
"$BUILDKITE_PIPELINE_SLUG" == "beats-metricbeat" || \
"$BUILDKITE_PIPELINE_SLUG" == "beats-packetbeat" || \
"$BUILDKITE_PIPELINE_SLUG" == "beats-xpack-agentbeat" || \
"$BUILDKITE_PIPELINE_SLUG" == "beats-xpack-auditbeat" || \
"$BUILDKITE_PIPELINE_SLUG" == "beats-xpack-filebeat" || \
"$BUILDKITE_PIPELINE_SLUG" == "beats-xpack-heartbeat" || \
Expand Down
97 changes: 0 additions & 97 deletions .buildkite/packaging.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ steps:
- metricbeat
- packetbeat
- winlogbeat
- x-pack/agentbeat
- x-pack/auditbeat
- x-pack/dockerlogbeat
- x-pack/filebeat
Expand All @@ -173,28 +172,6 @@ steps:
- x-pack/packetbeat
- x-pack/winlogbeat

## Agentbeat needs more CPUs because it builds many other beats
- label: "SNAPSHOT: x-pack/agentbeat all artifacts apart from linux/arm64, darwin/arm64, and windows/arm64"
env:
PLATFORMS: "${PLATFORMS}"
SNAPSHOT: true
# packaging with `DEV=true` may cause linker issues while crosscompiling https://github.com/elastic/beats/issues/41270
DEV: false
command: ".buildkite/scripts/packaging/package-dra.sh x-pack/agentbeat"
agents:
provider: gcp
image: "${IMAGE_UBUNTU_X86_64}"
machineType: "c2-standard-16"
timeout_in_minutes: 40
retry:
automatic:
- limit: 1
plugins:
- *dockerhub_login_plugin
- *docker_elastic_login_plugin
artifact_paths:
- build/distributions/**/*

- label: "SNAPSHOT: {{matrix}} Linux/amd64 FIPS"
env:
PLATFORMS: "${PLATFORMS_AMD64_FIPS}"
Expand Down Expand Up @@ -246,30 +223,6 @@ steps:
- x-pack/auditbeat
- x-pack/filebeat
- x-pack/metricbeat
- x-pack/agentbeat

## Agentbeat needs more CPUs because it builds many other beats
- label: "SNAPSHOT: x-pack/agentbeat Linux/amd64 FIPS"
env:
PLATFORMS: "${PLATFORMS_AMD64_FIPS}"
SNAPSHOT: true
# packaging with `DEV=true` may cause linker issues while crosscompiling https://github.com/elastic/beats/issues/41270
DEV: false
FIPS: true
command: ".buildkite/scripts/packaging/package-dra.sh x-pack/agentbeat"
agents:
provider: gcp
image: "${IMAGE_UBUNTU_X86_64}"
machineType: "c2-standard-16"
timeout_in_minutes: 40
retry:
automatic:
- limit: 1
artifact_paths:
- build/distributions/**/*
plugins:
- *dockerhub_login_plugin
- *docker_elastic_login_plugin

- group: Packaging Staging
key: packaging-staging
Expand Down Expand Up @@ -342,7 +295,6 @@ steps:
- metricbeat
- packetbeat
- winlogbeat
- x-pack/agentbeat
- x-pack/auditbeat
- x-pack/dockerlogbeat
- x-pack/filebeat
Expand All @@ -352,29 +304,6 @@ steps:
- x-pack/packetbeat
- x-pack/winlogbeat

## Agentbeat needs more CPUs because it builds many other beats
- label: "STAGING: x-pack/agentbeat all artifacts apart from linux/arm64, darwin/arm64, and windows/arm64"
env:
PLATFORMS: "${PLATFORMS}"
SNAPSHOT: false
DEV: false
command: |
source .buildkite/scripts/version_qualifier.sh
.buildkite/scripts/packaging/package-dra.sh x-pack/agentbeat
agents:
provider: gcp
image: "${IMAGE_UBUNTU_X86_64}"
machineType: "c2-standard-16"
timeout_in_minutes: 40
retry:
automatic:
- limit: 1
artifact_paths:
- build/distributions/**/*
plugins:
- *dockerhub_login_plugin
- *docker_elastic_login_plugin

- label: "STAGING: {{matrix}} Linux/amd64 FIPS"
env:
PLATFORMS: "${PLATFORMS_AMD64_FIPS}"
Expand Down Expand Up @@ -430,32 +359,6 @@ steps:
- x-pack/auditbeat
- x-pack/filebeat
- x-pack/metricbeat
- x-pack/agentbeat

## Agentbeat needs more CPUs because it builds many other beats
- label: "STAGING: x-pack/agentbeat Linux/amd64 FIPS"
env:
PLATFORMS: "${PLATFORMS_AMD64_FIPS}"
SNAPSHOT: false
# packaging with `DEV=true` may cause linker issues while crosscompiling https://github.com/elastic/beats/issues/41270
DEV: false
FIPS: true
command: |
source .buildkite/scripts/version_qualifier.sh
.buildkite/scripts/packaging/package-dra.sh x-pack/agentbeat
agents:
provider: gcp
image: "${IMAGE_UBUNTU_X86_64}"
machineType: "c2-standard-16"
timeout_in_minutes: 40
retry:
automatic:
- limit: 1
artifact_paths:
- build/distributions/**/*
plugins:
- *dockerhub_login_plugin
- *docker_elastic_login_plugin

- group: DRA publish
key: dra
Expand Down
40 changes: 0 additions & 40 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -588,46 +588,6 @@ steps:
commit: "${BUILDKITE_COMMIT}"
branch: "${BUILDKITE_BRANCH}"

- label: "Trigger Agentbeat"
if: build.pull_request.id != null
if_changed:
include:
- .go-version
- auditbeat/**
- filebeat/**
- heartbeat/**
- metricbeat/**
- osquerybeat/**
- packetbeat/**

- x-pack/agentbeat/**
- x-pack/auditbeat/**
- x-pack/filebeat/**
- x-pack/heartbeat/**
- x-pack/metricbeat/**
- x-pack/osquerybeat/**
- x-pack/packetbeat/**

- .buildkite/x-pack/pipeline.xpack.agentbeat.yml
- .buildkite/pipeline.yml
- .buildkite/scripts/**
- .buildkite/hooks/**
trigger: "beats-xpack-agentbeat"
build:
commit: "${BUILDKITE_COMMIT}"
branch: "${BUILDKITE_BRANCH}"
env:
BUILDKITE_PULL_REQUEST: ${BUILDKITE_PULL_REQUEST}
BUILDKITE_PULL_REQUEST_BASE_BRANCH: ${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
GITHUB_PR_LABELS: ${GITHUB_PR_LABELS}

- label: "Triggering Build for Agentbeat"
if: build.pull_request.id == null
trigger: "beats-xpack-agentbeat"
build:
commit: "${BUILDKITE_COMMIT}"
branch: "${BUILDKITE_BRANCH}"

# Triggers Serverless Beats tests in the elastic-agent repo for main/release branches
- label: "Serverless beats tests(elastic-agent)"
if: build.pull_request.id == null
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/dra.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ 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)
# > java.io.FileNotFoundException: /artifacts/build/distributions/filebeat/filebeat-8.15.0-SNAPSHOT-darwin-x86_64.tar.gz.sha512 (Permission denied)
chmod -R a+r build/*
chmod -R a+w build

Expand Down
Loading
Loading