Skip to content

Commit 517a15e

Browse files
committed
Merge remote-tracking branch 'upstream' into test/gh-runners-macos
* upstream: (505 commits) Update journald tests now that Filebeat supports watching folders (#10131) [deploy/kubernetes]: add info about hostPID for Universal Profiling (#10173) Fall back to process runtime if otel runtime is unsupported (#10087) Conditionall check for ms_tls13kdf build tag (#10160) [docs][edot] add entry for profiles (#10163) edot/docs: add support for profiles (#10146) Add Logstash exporter (#10137) Add back publish to serverless. (#10159) Improve Integration test documentation (#10155) Fix multiarch service image push from main to serverless (#10129) Forward migrate action to endpoint (#9801) Comment out check for ms_tls13kdf tag for FIPS-capable binaries (#10148) [otel] add receivers: apache, iis, mysql, postgresql, sqlserver v0.135.0 (#9344) Add k8sevents receiver in kube-stack (#10086) feat: emit system resource metrics for EDOT subprocess (#10003) [AutoOps] Configure OTel Exporter to Send Maximum-sized Batches (#10126) keep enrollment token when replacing data with signed (#10115) Revert "Publish `elastic-agent-service` container directly to serverless from main (#9583)" (#10127) Add agent_policy_id and policy_revision_idx to checkin requests (#9931) remove resource/k8s processor and use k8sattributes processor for service attributes (#10108) ...
2 parents d74cfdc + 5f0f2fd commit 517a15e

File tree

947 files changed

+226912
-45395
lines changed

Some content is hidden

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

947 files changed

+226912
-45395
lines changed
Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
3+
env:
4+
ASDF_MAGE_VERSION: 1.14.0
5+
MS_GOTOOLCHAIN_TELEMETRY_ENABLED: "0"
6+
7+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1757725254"
8+
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1757725254"
9+
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1757725254"
10+
ASDF_TERRAFORM_VERSION: 1.9.2
11+
12+
# This section is used to define the plugins that will be used in the pipeline.
13+
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
14+
common:
15+
# We are temporarily using the Production CFT environment API key instead of the
16+
# Staging GovCloud one. This is being done until issues with creating deployments in
17+
# Staging GovCloud are fixed. Once those are fixed, uncomment the `vault_ec_key_staging_frh_gov`
18+
# section and delete the `vault_ec_key_prod` section below.
19+
# - vault_ec_key_staging_frh_gov: &vault_ec_key_staging_frh_gov
20+
# elastic/vault-secrets#v0.1.0:
21+
# path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
22+
# field: "apiKey"
23+
# env_var: "EC_API_KEY"
24+
- vault_ec_key_prod: &vault_ec_key_prod
25+
elastic/vault-secrets#v0.1.0:
26+
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
27+
field: "apiKey"
28+
env_var: "EC_API_KEY"
29+
steps:
30+
- label: Start ESS stack for FIPS integration tests
31+
key: integration-fips-ess
32+
env:
33+
FIPS: "true"
34+
# EC_ENDPOINT: "https://api.staging.elastic-gov.com"
35+
# ESS_REGION: "us-gov-east-1"
36+
# TF_VAR_deployment_template_id: "aws-general-purpose"
37+
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
38+
TF_VAR_docker_images_name_suffix: "-fips"
39+
command: |
40+
source .buildkite/scripts/steps/ess_start.sh
41+
artifact_paths:
42+
- test_infra/ess/*.tfstate
43+
- test_infra/ess/*.lock.hcl
44+
agents:
45+
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
46+
useCustomGlobalHooks: true
47+
plugins:
48+
- *vault_ec_key_prod
49+
50+
- group: "fips:Stateful:Ubuntu"
51+
key: integration-tests-ubuntu-fips
52+
depends_on:
53+
- integration-fips-ess
54+
steps:
55+
- label: "fips:x86_64:sudo-{{matrix.sudo}}:{{matrix.groups}}"
56+
depends_on:
57+
- packaging-ubuntu-x86-64-fips # Reuse artifacts produced in .buildkite/integration.pipeline.yml
58+
env:
59+
FIPS: "true"
60+
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
61+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
62+
command: |
63+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64-fips'
64+
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.groups}} {{matrix.sudo}}
65+
artifact_paths:
66+
- build/**
67+
- build/diagnostics/**
68+
retry:
69+
automatic:
70+
limit: 1
71+
agents:
72+
provider: "aws"
73+
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
74+
instanceType: "m5.2xlarge"
75+
plugins:
76+
- *vault_ec_key_prod
77+
matrix:
78+
setup:
79+
sudo:
80+
- "false"
81+
- "true"
82+
groups:
83+
- fleet # currently there is only a single test in the fleet group, add more tests once they have been defined
84+
85+
- label: "fips:arm64:sudo-{{matrix.sudo}}:{{matrix.groups}}"
86+
depends_on:
87+
- packaging-ubuntu-arm64-fips
88+
env:
89+
FIPS: "true"
90+
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
91+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
92+
command: |
93+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64-fips'
94+
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.groups}} {{matrix.sudo}}
95+
artifact_paths:
96+
- build/**
97+
- build/diagnostics/**
98+
retry:
99+
automatic:
100+
limit: 1
101+
agents:
102+
provider: "aws"
103+
image: "${IMAGE_UBUNTU_ARM64_FIPS}"
104+
instanceType: "m6g.2xlarge"
105+
plugins:
106+
- *vault_ec_key_prod
107+
matrix:
108+
setup:
109+
sudo:
110+
- "false"
111+
- "true"
112+
groups:
113+
- fleet
114+
115+
- label: "fips:upgrade-ech-deployment"
116+
if: build.env("BUILDKITE_PULL_REQUEST") != "false" && build.env("GITHUB_PR_LABELS") =~ /.*(Testing:run:TestUpgradeIntegrationsServer).*/
117+
env:
118+
FIPS: "true"
119+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
120+
command: |
121+
.buildkite/scripts/buildkite-integration-tests.sh ech-deployment false
122+
artifact_paths:
123+
- build/**
124+
- build/diagnostics/**
125+
retry:
126+
automatic:
127+
limit: 1
128+
agents:
129+
provider: "aws"
130+
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
131+
instanceType: "m5.2xlarge"
132+
plugins:
133+
- *vault_ec_key_prod
134+
135+
- label: ESS FIPS stack cleanup
136+
depends_on:
137+
- integration-tests-ubuntu-fips
138+
env:
139+
FIPS: "true"
140+
# EC_ENDPOINT: "https://api.staging.elastic-gov.com"
141+
# ESS_REGION: "us-gov-east-1"
142+
# TF_VAR_deployment_template_id: "aws-general-purpose"
143+
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
144+
TF_VAR_docker_images_name_suffix: "-fips"
145+
allow_dependency_failure: true
146+
command: |
147+
buildkite-agent artifact download "test_infra/ess/**" . --step "integration-fips-ess"
148+
ls -lah test_infra/ess
149+
.buildkite/scripts/steps/ess_down.sh
150+
agents:
151+
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
152+
useCustomGlobalHooks: true
153+
plugins:
154+
- *vault_ec_key_prod
155+
156+
- label: Aggregate test reports
157+
depends_on:
158+
- integration-tests-ubuntu-fips
159+
allow_dependency_failure: true
160+
command: |
161+
buildkite-agent artifact download "build/*.xml" .
162+
agents:
163+
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
164+
useCustomGlobalHooks: true
165+
soft_fail:
166+
- exit_status: "*"
167+
plugins:
168+
- elastic/vault-secrets#v0.1.0:
169+
path: "kv/ci-shared/platform-ingest/buildkite_analytics_token"
170+
field: "token"
171+
env_var: "BUILDKITE_ANALYTICS_TOKEN"
172+
- test-collector#v1.11.0:
173+
files: "build/*.xml"
174+
format: "junit"
175+
branches: "main"
176+
debug: true

0 commit comments

Comments
 (0)