Skip to content

Commit a6f0f28

Browse files
colleenmcginniscolleenmcginnis
authored
Merge branch 'main' into add-markdown-release-notes
2 parents d24ed7c + b646814 commit a6f0f28

File tree

135 files changed

+4713
-1378
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+4713
-1378
lines changed

‎.buildkite/bk.integration-fips.pipeline.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ env:
44
ASDF_MAGE_VERSION: 1.14.0
55
MS_GOTOOLCHAIN_TELEMETRY_ENABLED: "0"
66

7-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1753491662"
8-
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1753491662"
9-
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1753491662"
7+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1755910857"
8+
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1755910857"
9+
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1755910857"
1010

1111
# This section is used to define the plugins that will be used in the pipeline.
1212
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins

‎.buildkite/bk.integration.pipeline.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ env:
66

77
# The following images are defined here and their values will be updated by updatecli
88
# Please do not change them manually.
9-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1753491662"
10-
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1753491662"
11-
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1753491662"
12-
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1753491662"
13-
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1753491662"
14-
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1753491662"
9+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1755910857"
10+
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1755910857"
11+
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1755910857"
12+
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1755910857"
13+
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1755910857"
14+
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1755910857"
1515

1616
# This section is used to define the plugins that will be used in the pipeline.
1717
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins

‎.buildkite/integration.pipeline.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ env:
66

77
# The following images are defined here and their values will be updated by updatecli
88
# Please do not change them manually.
9-
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1753491662"
10-
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1753491662"
9+
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1755910857"
10+
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1755910857"
1111

1212
common:
1313
- vault_docker_login: &vault_docker_login

‎.buildkite/pipeline.agentless-app-release.yaml‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,46 @@
11
env:
22
VERSION: "${BUILDKITE_COMMIT:0:12}"
33
steps:
4-
- label: "Mirror Elastic-Agent Snapshot DRA to internal registry"
4+
- label: "Packaging: Service Container linux/amd64"
5+
key: packaging-service-container-amd64
6+
env:
7+
PACKAGES: "docker"
8+
PLATFORMS: "linux/amd64"
9+
DOCKER_VARIANTS: "service"
10+
command: |
11+
.buildkite/scripts/steps/integration-package.sh
12+
artifact_paths:
13+
- "build/distributions/elastic-agent-service-git-*.docker.tar.gz"
14+
agents:
15+
provider: "gcp"
16+
machineType: "c2-standard-16"
17+
diskSizeGb: 400
18+
19+
- label: "Packaging: Service Container linux/arm64"
20+
key: packaging-service-container-arm64
21+
env:
22+
PACKAGES: "docker"
23+
PLATFORMS: "linux/arm64"
24+
DOCKER_VARIANTS: "service"
25+
command: |
26+
.buildkite/scripts/steps/integration-package.sh
27+
artifact_paths:
28+
- "build/distributions/elastic-agent-service-git-*.docker.tar.gz"
29+
agents:
30+
provider: "aws"
31+
instanceType: "t4g.2xlarge"
32+
imagePrefix: "core-ubuntu-2204-aarch64"
33+
diskSizeGb: 400
34+
35+
# wait for packaging to be done
36+
- wait: ~
37+
38+
- label: "Publish to internal registry"
539
key: "mirror-elastic-agent"
640
command: ".buildkite/scripts/steps/ecp-internal-release.sh"
741
agents:
842
image: docker.elastic.co/ci-agent-images/serverless-helm-builder:0.0.2@sha256:d00e8a7a0ab3618cfaacb0a7b1e1b06ee29728eb2b44de602374bd8f6b9b92ac
943

10-
11-
1244
# wait for metadata to be set
1345
- wait: ~
1446

‎.buildkite/pipeline.yml‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ env:
55

66
# The following images are defined here and their values will be updated by updatecli
77
# Please do not change them manually.
8-
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1753491662"
9-
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1753491662"
10-
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1753491662"
11-
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1753491662"
12-
IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1753491662"
13-
IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1753491662"
8+
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1755910857"
9+
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1755910857"
10+
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1755910857"
11+
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1755910857"
12+
IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1755910857"
13+
IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1755910857"
1414

1515
steps:
1616
- label: "check-ci"
@@ -371,3 +371,10 @@ steps:
371371
build:
372372
commit: "${BUILDKITE_COMMIT}"
373373
branch: "${BUILDKITE_BRANCH}"
374+
375+
# wait for packaging to be done
376+
- wait: ~
377+
378+
- label: "Publish to serverless"
379+
branches: main
380+
trigger: "agentless-serverless-release"

‎.buildkite/scripts/steps/ecp-internal-release.sh‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ set -eu
2020
_SELF=$(dirname $0)
2121
source "${_SELF}/../common.sh"
2222

23-
2423
# annotate create temp markdown file if not exists
2524
# this file will be later used to annotate the build
2625
# it appends to the file the message passed as argument
@@ -33,19 +32,9 @@ write_annotation() {
3332
cat $BUILDKITE_ANNOTATE_FILE | buildkite-agent annotate --style info
3433
}
3534

35+
BUILD_VERSION="$(jq -r '.version' .package-version)"
36+
DOCKER_TAG="git-${VERSION}"
3637
PRIVATE_REPO="docker.elastic.co/observability-ci/ecp-elastic-agent-service"
37-
SNAPSHOT_DRA_URL=https://snapshots.elastic.co/latest/master.json
38-
39-
DRA_RESULT=$(curl -s -X GET "$SNAPSHOT_DRA_URL")
40-
echo "$DRA_RESULT"
41-
BUILD_ID=$(echo "$DRA_RESULT" | jq '.build_id' | tr -d '"')
42-
BUILD_VERSION=$(echo "$DRA_RESULT" | jq '.version' | tr -d '"')
43-
44-
MANIFEST_URL="https://snapshots.elastic.co/$BUILD_ID/agent-package/agent-artifacts-$BUILD_VERSION.json"
45-
GIT_COMMIT=$(curl -s -X GET "$MANIFEST_URL" | jq '.projects["elastic-agent-core"]["commit_hash"]' | tr -d '"')
46-
GIT_SHORT_COMMIT=$(echo "$GIT_COMMIT" | cut -c1-12)
47-
48-
DOCKER_TAG="git-${GIT_SHORT_COMMIT}"
4938
PRIVATE_IMAGE="${PRIVATE_REPO}:${DOCKER_TAG}"
5039

5140
# TODO: let's avoid accessing vault directly but use the vault plugin itself
@@ -57,13 +46,19 @@ DOCKER_REGISTRY="docker.elastic.co"
5746
DOCKER_USERNAME_SECRET=$(retry 5 vault kv get -field user "${DOCKER_REGISTRY_SECRET_PATH}")
5847
DOCKER_PASSWORD_SECRET=$(retry 5 vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}")
5948
skopeo login --username "${DOCKER_USERNAME_SECRET}" --password "${DOCKER_PASSWORD_SECRET}" "${DOCKER_REGISTRY}"
60-
skopeo copy --all "docker://docker.elastic.co/cloud-release/elastic-agent-service:$BUILD_ID-SNAPSHOT" "docker://$PRIVATE_IMAGE"
49+
50+
# download the amd64 and arm64 builds of the image from the previous steps
51+
buildkite-agent artifact download "build/distributions/**" . --step "packaging-service-container-amd64"
52+
buildkite-agent artifact download "build/distributions/**" . --step "packaging-service-container-arm64"
53+
54+
# copy the images into the private image location
55+
skopeo copy --all "docker-archive:./build/distributions/elastic-agent-service-$DOCKER_TAG-$BUILD_VERSION-linux-amd64.docker.tar.gz" "docker://$PRIVATE_IMAGE"
56+
skopeo copy --all "docker-archive:./build/distributions/elastic-agent-service-$DOCKER_TAG-$BUILD_VERSION-linux-arm64.docker.tar.gz" "docker://$PRIVATE_IMAGE"
6157

6258
annotate "* Image: $PRIVATE_IMAGE"
63-
annotate "* Short commit: $GIT_SHORT_COMMIT"
64-
annotate "* Commit: https://github.com/elastic/elastic-agent/commit/$GIT_COMMIT"
65-
annotate "* Manifest: $MANIFEST_URL"
59+
annotate "* Short commit: $VERSION"
60+
annotate "* Commit: https://github.com/elastic/elastic-agent/commit/$VERSION"
6661

67-
buildkite-agent meta-data set "git-short-commit" "$GIT_SHORT_COMMIT"
62+
buildkite-agent meta-data set "git-short-commit" "$VERSION"
6863

6964
write_annotation

‎.github/workflows/backport-active.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Backport to active branches
22

33
on:
44
pull_request_target:
5-
types: [closed]
5+
types: [closed, labeled]
66
branches:
77
- main
88

@@ -13,9 +13,13 @@ permissions:
1313
jobs:
1414
backport:
1515
# Only run if the PR was merged (not just closed) and has one of the backport labels
16+
# or has been added afterwards.
1617
if: |
1718
github.event.pull_request.merged == true &&
18-
contains(toJSON(github.event.pull_request.labels.*.name), 'backport-active-')
19+
(
20+
(github.event.action == 'closed' && contains(toJSON(github.event.pull_request.labels.*.name), 'backport-active-')) ||
21+
(github.event.action == 'labeled' && startsWith(github.event.label.name, 'backport-active-'))
22+
)
1923
runs-on: ubuntu-latest
2024

2125
steps:

‎.github/workflows/docs-build.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: docs-build
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request_target: ~
8+
merge_group: ~
9+
10+
jobs:
11+
docs-preview:
12+
uses: elastic/docs-builder/.github/workflows/preview-build.yml@main
13+
with:
14+
path-pattern: docs/**
15+
permissions:
16+
deployments: write
17+
id-token: write
18+
contents: read
19+
pull-requests: write

‎.github/workflows/docs-cleanup.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: docs-cleanup
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- closed
7+
8+
jobs:
9+
docs-preview:
10+
uses: elastic/docs-builder/.github/workflows/preview-cleanup.yml@main
11+
permissions:
12+
contents: none
13+
id-token: write
14+
deployments: write

‎.github/workflows/serverless-project.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
project-id: "elastic-observability-ci"
8080

8181
- name: Set up Cloud SDK
82-
uses: google-github-actions/setup-gcloud@cb1e50a9932213ecece00a606661ae9ca44f3397
82+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db # v3.0.1
8383

8484
# TODO: as soon as the oblt-framework supports elastic-observability-ci we can avoid this step.
8585
# NOTE:

0 commit comments

Comments
 (0)